Bug 525679 - Remove the bizarre artifact of a separate profile icon for non-Firefox Windows XP, r=dao
authorPhil Ringnalda <philringnalda@gmail.com>
Tue, 03 Nov 2009 19:36:50 -0800
changeset 34525 364c3910daed996519174343f98093c6091cc332
parent 34524 95c4abb606ee073d8393593e1a14c10c0d35137a
child 34526 bc605fa80ef68bb9b7ed7681a476dc1ac938eddd
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdao
bugs525679
milestone1.9.3a1pre
Bug 525679 - Remove the bizarre artifact of a separate profile icon for non-Firefox Windows XP, r=dao
toolkit/profile/Makefile.in
toolkit/profile/skin/Makefile.in
toolkit/profile/skin/jar.mn
toolkit/profile/skin/profileSelection.css
toolkit/profile/skin/profileicon.png
toolkit/toolkit-makefiles.sh
--- a/toolkit/profile/Makefile.in
+++ b/toolkit/profile/Makefile.in
@@ -39,16 +39,9 @@ DEPTH		= ../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 DIRS = public src
 
-# Use Qute for non-Mac non-Phoenix apps
-ifneq (cocoa,$(MOZ_WIDGET_TOOLKIT))
-ifndef MOZ_PHOENIX
-DIRS += skin
-endif
-endif
-
 include $(topsrcdir)/config/rules.mk
deleted file mode 100644
--- a/toolkit/profile/skin/Makefile.in
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH		= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-include $(topsrcdir)/config/rules.mk
deleted file mode 100644
--- a/toolkit/profile/skin/jar.mn
+++ /dev/null
@@ -1,3 +0,0 @@
-toolkit.jar:
-  skin/classic/mozapps/profile/profileSelection.css
-  skin/classic/mozapps/profile/profileicon.png
deleted file mode 100644
--- a/toolkit/profile/skin/profileSelection.css
+++ /dev/null
@@ -1,57 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is new Mozilla XUL toolkit.
- *
- * The Initial Developer of the Original Code is
- * Benjamin Smedberg <bsmedberg@covad.net>
- * Portions created by the Initial Developer are Copyright (C) 2004
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-
-@import url("chrome://global/skin/global.css");
-
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-
-#profiles > listitem {
-  list-style-image: url("chrome://mozapps/skin/profile/profileicon.png");
-}
-
-#profiles > listitem > listcell > image {
-  width: 16px;
-  height: 16px;
-}
-
-box#managebuttons > button {
-  min-width: 8em;
-}
-
-#managebuttons {
-  padding-top: 1em;
-}
deleted file mode 100644
index a107f49cef7dea328c1ef728e8a4a431cc659c95..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
--- a/toolkit/toolkit-makefiles.sh
+++ b/toolkit/toolkit-makefiles.sh
@@ -753,17 +753,16 @@ MAKEFILES_xulapp="
   toolkit/mozapps/plugins/Makefile
   toolkit/mozapps/update/Makefile
   toolkit/mozapps/update/public/Makefile
   toolkit/mozapps/update/src/Makefile
   toolkit/mozapps/update/src/updater/Makefile
   toolkit/mozapps/xpinstall/Makefile
   toolkit/profile/Makefile
   toolkit/profile/public/Makefile
-  toolkit/profile/skin/Makefile
   toolkit/profile/src/Makefile
   toolkit/system/dbus/Makefile
   toolkit/system/gnome/Makefile
   toolkit/system/unixproxy/Makefile
   toolkit/system/osxproxy/Makefile
   toolkit/system/windowsproxy/Makefile
   toolkit/themes/Makefile
   toolkit/themes/gnomestripe/global/Makefile