diff --git a/Makefile.in b/Makefile.in
index 2833cf246d99..37e46133d632 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -334,9 +334,6 @@ ifdef MOZ_USE_OFFICIAL_BRANDING
tier_99_dirs += other-licenses/branding/firefox
endif
tier_99_dirs += browser xpfe/bootstrap/init.d
-ifdef MOZ_USE_OFFICIAL_BRANDING
-tier_99_dirs += other-licenses/branding/firefox/content
-endif
endif
ifdef MOZ_XULRUNNER
@@ -352,9 +349,6 @@ ifdef MOZ_USE_OFFICIAL_BRANDING
tier_99_dirs += other-licenses/branding/thunderbird
endif
tier_99_dirs += mail xpfe/bootstrap/init.d
-ifdef MOZ_USE_OFFICIAL_BRANDING
-tier_99_dirs += other-licenses/branding/thunderbird/content
-endif
endif
ifdef MOZ_STANDALONE_COMPOSER
diff --git a/allmakefiles.sh b/allmakefiles.sh
index 5d56f15e6236..38a9f75b8594 100755
--- a/allmakefiles.sh
+++ b/allmakefiles.sh
@@ -864,11 +864,13 @@ extensions/typeaheadfind/Makefile
MAKEFILES_firefox_branding="
other-licenses/branding/firefox/Makefile
other-licenses/branding/firefox/content/Makefile
+other-licenses/branding/firefox/locales/Makefile
"
MAKEFILES_thunderbird_branding="
other-licenses/branding/thunderbird/Makefile
other-licenses/branding/thunderbird/content/Makefile
+other-licenses/branding/thunderbird/locales/Makefile
"
MAKEFILES_phoenix="
diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index 35888e409bbe..a7f53c15509d 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -180,11 +180,11 @@ pref("browser.search.defaulturl", "chrome://browser-region/locale/re
pref("browser.search.order.1", "chrome://browser-region/locale/region.properties");
pref("browser.search.order.2", "chrome://browser-region/locale/region.properties");
-pref("browser.search.param.Google.1.default", "chrome://browser/content/searchconfig.properties");
-pref("browser.search.param.Google.1.custom", "chrome://browser/content/searchconfig.properties");
-pref("browser.search.order.Yahoo.1", "chrome://browser/content/searchconfig.properties");
-pref("browser.search.order.Yahoo.2", "chrome://browser/content/searchconfig.properties");
-pref("browser.search.order.Yahoo", "chrome://browser/content/searchconfig.properties");
+pref("browser.search.param.Google.1.default", "chrome://branding/content/searchconfig.properties");
+pref("browser.search.param.Google.1.custom", "chrome://branding/content/searchconfig.properties");
+pref("browser.search.order.Yahoo.1", "chrome://branding/content/searchconfig.properties");
+pref("browser.search.order.Yahoo.2", "chrome://branding/content/searchconfig.properties");
+pref("browser.search.order.Yahoo", "chrome://branding/content/searchconfig.properties");
// basic search popup constraint: minimum sherlock plugin version displayed
// (note: must be a string representation of a float or it'll default to 0.0)
diff --git a/browser/base/Makefile.in b/browser/base/Makefile.in
index 72465cdd70f3..2079d25e2ced 100644
--- a/browser/base/Makefile.in
+++ b/browser/base/Makefile.in
@@ -44,22 +44,20 @@ include $(DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/config.mk
-AB_CD = $(MOZ_UI_LOCALE)
-
-DEFINES += -DAB_CD=$(AB_CD) -DMOZ_APP_VERSION=$(MOZ_APP_VERSION)
-
include $(topsrcdir)/config/rules.mk
-DEFINES += -DMOZ_APP_VERSION=$(MOZ_APP_VERSION) -DMOZ_DISTRIBUTION_ID_UNQUOTED=$(MOZ_DISTRIBUTION_ID_UNQUOTED)
+DEFINES += -DMOZ_APP_VERSION=$(MOZ_APP_VERSION)
+
+ifdef MOZ_USE_OFFICIAL_BRANDING
+DEFINES += -DMOZ_USE_OFFICIAL_BRANDING
+endif
ifneq (,$(filter windows gtk2, $(MOZ_WIDGET_TOOLKIT)))
DEFINES += -DHAVE_SHELL_SERVICE=1
endif
libs locale::
- @$(PERL) $(topsrcdir)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) \
- $(srcdir)/content/browserconfig.properties > $(DIST)/bin/browserconfig.properties
+ $(INSTALL) $(srcdir)/content/browserconfig.properties $(DIST)/bin
install::
- @$(PERL) $(topsrcdir)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) \
- $(srcdir)/content/browserconfig.properties > $(DESTDIR)$(mozappdir)/browserconfig.properties
+ $(INSTALL) $(srcdir)/content/browserconfig.properties $(DESTDIR)$(mozappdir)
diff --git a/browser/base/content/about.png b/browser/base/branding/about.png
similarity index 100%
rename from browser/base/content/about.png
rename to browser/base/branding/about.png
diff --git a/browser/base/content/aboutCredits.png b/browser/base/branding/aboutCredits.png
similarity index 100%
rename from browser/base/content/aboutCredits.png
rename to browser/base/branding/aboutCredits.png
diff --git a/browser/base/content/aboutFooter.png b/browser/base/branding/aboutFooter.png
similarity index 100%
rename from browser/base/content/aboutFooter.png
rename to browser/base/branding/aboutFooter.png
diff --git a/browser/base/branding/contents.rdf b/browser/base/branding/contents.rdf
new file mode 100755
index 000000000000..1b9125e78532
--- /dev/null
+++ b/browser/base/branding/contents.rdf
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/toolkit/themes/pinstripe/global/icons/alert-exclam.png b/browser/base/branding/icon64.png
similarity index 100%
rename from toolkit/themes/pinstripe/global/icons/alert-exclam.png
rename to browser/base/branding/icon64.png
diff --git a/browser/base/content/searchconfig.properties b/browser/base/branding/searchconfig.properties
similarity index 100%
rename from browser/base/content/searchconfig.properties
rename to browser/base/branding/searchconfig.properties
diff --git a/browser/base/content/aboutDialog.css b/browser/base/content/aboutDialog.css
index a55b383c0c5d..72504e2dbd4a 100644
--- a/browser/base/content/aboutDialog.css
+++ b/browser/base/content/aboutDialog.css
@@ -3,7 +3,7 @@
}
#clientBox {
- background-image: url("chrome://browser/content/about.png");
+ background-image: url("chrome://branding/content/about.png");
background-repeat: no-repeat;
background-color: #FFFFFF;
padding-top: 203px;
diff --git a/browser/base/content/browser-sets.inc b/browser/base/content/browser-sets.inc
index 0977f913dd68..2a9accd0f402 100644
--- a/browser/base/content/browser-sets.inc
+++ b/browser/base/content/browser-sets.inc
@@ -44,7 +44,7 @@
#endif
-
+
diff --git a/browser/base/content/credits.xhtml b/browser/base/content/credits.xhtml
index 996ba891eb68..f76264630bcd 100644
--- a/browser/base/content/credits.xhtml
+++ b/browser/base/content/credits.xhtml
@@ -193,7 +193,7 @@
-
+
@@ -343,7 +343,7 @@