From 3219ac4125f002d7eadf994d20bce974be60f01a Mon Sep 17 00:00:00 2001 From: "bsmedberg%covad.net" Date: Thu, 10 Mar 2005 04:38:35 +0000 Subject: [PATCH] Bug 282057 - brand.dtd/properties live in the wrong chrome package... xulrunner apps cannot provide these files, which means they can't use various toolkit features r=darin moa=Neil (seamonkey) --- Makefile.in | 6 --- allmakefiles.sh | 2 + browser/app/profile/firefox.js | 10 ++-- browser/base/Makefile.in | 16 +++--- browser/base/{content => branding}/about.png | Bin .../{content => branding}/aboutCredits.png | Bin .../{content => branding}/aboutFooter.png | Bin browser/base/branding/contents.rdf | 13 +++++ .../base/branding/icon64.png | Bin .../searchconfig.properties | 0 browser/base/content/aboutDialog.css | 2 +- browser/base/content/browser-sets.inc | 2 +- browser/base/content/credits.xhtml | 4 +- browser/base/jar.mn | 12 +++-- .../components/bookmarks/content/bookmarks.js | 2 +- browser/components/history/content/history.js | 2 +- browser/components/preferences/general.xul | 2 +- browser/components/shell/src/nsShellService.h | 2 +- .../shell/src/nsWindowsShellService.cpp | 2 +- browser/installer/unix/ab-CD.jst | 1 + browser/installer/unix/browser.jst | 1 + browser/installer/windows/ab-CD.jst | 1 + browser/installer/windows/browser.jst | 1 + browser/locales/Makefile.in | 4 ++ .../locales/en-US/chrome/branding/brand.dtd | 5 ++ .../en-US/chrome/branding/brand.properties | 3 ++ .../generic/chrome/branding/contents.rdf | 21 ++++++++ browser/locales/jar.mn | 7 ++- .../p3p/resources/content/nsPolicyViewer.js | 2 +- layout/printing/nsPrintData.cpp | 2 +- mail/base/Makefile.in | 5 +- mail/base/content/ABSearchDialog.xul | 2 +- mail/base/content/SearchDialog.xul | 2 +- mail/base/content/aboutDialog.css | 2 +- mail/base/content/contents-branding.rdf | 14 +++++ mail/base/content/hiddenWindow.xul | 2 +- mail/base/content/messageWindow.xul | 2 +- mail/base/content/messenger.xul | 2 +- mail/base/content/msgPrintEngine.xul | 2 +- mail/base/content/msgSelectOffline.xul | 2 +- .../content}/thunderbird-watermark.png | Bin mail/base/jar.mn | 8 ++- .../addrbook/content/addressbook.xul | 2 +- .../gnome/nsMailGNOMEIntegration.cpp | 2 +- .../migration/content/migration.css | 2 +- mail/config/en-US-jar.mn | 1 + mail/config/installed-chrome.txt | 2 + mail/config/mail-jar.mn | 1 + mail/extensions/smime/content/am-smime.xul | 2 +- .../smime/content/msgCompSMIMEOverlay.xul | 2 +- mail/installer/windows/langenus.jst | 1 + mail/installer/windows/mail.jst | 1 + mail/locales/Makefile.in | 4 ++ mail/locales/en-US/chrome/branding/brand.dtd | 5 ++ .../en-US/chrome/branding/brand.properties | 10 ++++ .../en-US/chrome/messenger/credits.html | 2 +- .../locales/en-US/chrome/messenger/start.html | 2 +- .../generic/chrome/branding/contents.rdf | 21 ++++++++ mail/locales/jar.mn | 8 +-- .../resources/content/addressbook.xul | 2 +- .../resources/content/AccountManager.xul | 2 +- .../resources/content/SmtpServerEdit.xul | 2 +- .../content/mail3PaneWindowVertLayout.xul | 2 +- .../base/resources/content/messageWindow.xul | 2 +- mailnews/base/resources/content/messenger.xul | 2 +- .../resources/content/msgAccountCentral.xul | 2 +- .../base/resources/content/msgPrintEngine.xul | 2 +- .../resources/content/msgSelectOffline.xul | 2 +- .../resources/content/ABSearchDialog.xul | 2 +- .../search/resources/content/SearchDialog.xul | 2 +- mailnews/compose/src/nsMsgCompUtils.cpp | 2 +- .../smime/resources/content/am-smime.xul | 2 +- .../resources/content/msgCompSMIMEOverlay.xul | 2 +- .../resources/content/msgReadSMIMEOverlay.xul | 2 +- mailnews/mapi/mapihook/src/msgMapiHook.cpp | 2 +- .../mapi/mapihook/src/nsMapiRegistryUtils.cpp | 2 +- .../decoders/icon/gtk/nsIconChannel.cpp | 2 +- modules/plugin/base/src/nsPluginHostImpl.cpp | 2 +- other-licenses/branding/firefox/Makefile.in | 5 ++ .../branding/firefox/content/contents.rdf | 13 +++++ .../branding/firefox/content/icon32.png | Bin 3473 -> 0 bytes .../content/{alert-exclam.png => icon64.png} | Bin .../branding/firefox/content/jar.mn | 15 +++--- .../branding/firefox/locales/Makefile.in | 47 +++++++++++++++++ .../branding/firefox/locales/contents.rdf | 21 ++++++++ .../branding/firefox/locales/en-US}/brand.dtd | 0 .../firefox/locales/en-US}/brand.properties | 0 .../branding/firefox/locales/jar.mn | 6 +++ .../branding/thunderbird/Makefile.in | 5 ++ .../branding/thunderbird/content/contents.rdf | 13 +++++ .../branding/thunderbird/content/jar.mn | 11 ++-- .../branding/thunderbird/locales/Makefile.in | 49 ++++++++++++++++++ .../branding/thunderbird/locales/contents.rdf | 21 ++++++++ .../thunderbird/locales/en-US}/brand.dtd | 0 .../locales/en-US}/brand.properties | 0 .../branding/thunderbird/locales/jar.mn | 6 +++ .../resources/content/profileSelection.xul | 2 +- profile/src/nsProfile.cpp | 2 +- .../resources/content/serverCrlNextupdate.js | 2 +- security/manager/ssl/src/nsNSSIOLayer.cpp | 2 +- .../downloads/src/nsDownloadManager.cpp | 2 +- toolkit/content/about.xhtml | 2 +- .../locales/generic/chrome/global/brand.dtd | 2 + toolkit/locales/jar.mn | 1 + .../mozapps/downloads/content/downloads.xul | 2 +- .../mozapps/extensions/content/extensions.js | 4 +- .../mozapps/extensions/content/extensions.xul | 2 +- toolkit/mozapps/extensions/content/update.xul | 2 +- .../extensions/src/nsExtensionManager.js.in | 14 ++--- .../plugins/content/pluginInstallerWizard.xul | 2 +- toolkit/mozapps/update/content/errors.xul | 2 +- toolkit/mozapps/update/content/update.xul | 2 +- .../mozapps/update/src/nsUpdateService.js.in | 2 +- toolkit/profile/content/profileSelection.xul | 2 +- toolkit/themes/pinstripe/global/global.css | 4 +- .../exthandler/mac/nsOSHelperAppService.cpp | 2 +- xpfe/bootstrap/nsNativeAppSupportWin.cpp | 4 +- xpfe/browser/resources/content/navigator.xul | 2 +- xpfe/communicator/jar.mn | 8 +++ .../resources/content/contents-branding.rdf | 14 +++++ .../resources/locale/en-US/brand.dtd | 4 ++ .../resources/locale/en-US/brand.properties | 0 .../locale/en-US/contents-branding.rdf | 22 ++++++++ .../bookmarks/resources/bm-props.xul | 2 +- .../bookmarks/resources/bookmarks.js | 2 +- .../bookmarks/resources/bookmarksOverlay.xul | 2 +- xpfe/components/history/resources/history.js | 2 +- .../resources/content/pref-advanced.xul | 2 +- .../content/pref-applications-edit.xul | 2 +- .../resources/content/pref-themes.js | 2 +- .../resources/content/pref-themes.xul | 2 +- .../search/src/nsInternetSearchService.cpp | 4 +- xpfe/components/sidebar/src/nsSidebar.js | 6 +-- xpfe/components/startup/src/nsAppStartup.cpp | 2 +- xpfe/components/winhooks/nsWindowsHooks.cpp | 4 +- xpfe/global/jar.mn | 3 +- xpfe/global/resources/locale/en-US/brand.dtd | 6 +-- xpinstall/packager/unix/browser.jst | 1 + xpinstall/packager/unix/langenus.jst | 1 + xpinstall/packager/windows/browser.jst | 1 + xpinstall/packager/windows/langenus.jst | 1 + 141 files changed, 497 insertions(+), 143 deletions(-) rename browser/base/{content => branding}/about.png (100%) rename browser/base/{content => branding}/aboutCredits.png (100%) rename browser/base/{content => branding}/aboutFooter.png (100%) create mode 100755 browser/base/branding/contents.rdf rename toolkit/themes/pinstripe/global/icons/alert-exclam.png => browser/base/branding/icon64.png (100%) rename browser/base/{content => branding}/searchconfig.properties (100%) create mode 100755 browser/locales/en-US/chrome/branding/brand.dtd create mode 100755 browser/locales/en-US/chrome/branding/brand.properties create mode 100755 browser/locales/generic/chrome/branding/contents.rdf create mode 100755 mail/base/content/contents-branding.rdf rename mail/{locales/en-US/chrome/messenger => base/content}/thunderbird-watermark.png (100%) create mode 100755 mail/locales/en-US/chrome/branding/brand.dtd create mode 100755 mail/locales/en-US/chrome/branding/brand.properties create mode 100755 mail/locales/generic/chrome/branding/contents.rdf create mode 100755 other-licenses/branding/firefox/content/contents.rdf delete mode 100644 other-licenses/branding/firefox/content/icon32.png rename other-licenses/branding/firefox/content/{alert-exclam.png => icon64.png} (100%) create mode 100755 other-licenses/branding/firefox/locales/Makefile.in create mode 100755 other-licenses/branding/firefox/locales/contents.rdf rename {browser/locales/en-US/chrome/global => other-licenses/branding/firefox/locales/en-US}/brand.dtd (100%) rename {browser/locales/en-US/chrome/global => other-licenses/branding/firefox/locales/en-US}/brand.properties (100%) create mode 100755 other-licenses/branding/firefox/locales/jar.mn create mode 100755 other-licenses/branding/thunderbird/content/contents.rdf create mode 100755 other-licenses/branding/thunderbird/locales/Makefile.in create mode 100755 other-licenses/branding/thunderbird/locales/contents.rdf rename {mail/locales/en-US/chrome/global => other-licenses/branding/thunderbird/locales/en-US}/brand.dtd (100%) rename {mail/locales/en-US/chrome/global => other-licenses/branding/thunderbird/locales/en-US}/brand.properties (100%) create mode 100755 other-licenses/branding/thunderbird/locales/jar.mn create mode 100755 toolkit/locales/generic/chrome/global/brand.dtd create mode 100755 xpfe/communicator/resources/content/contents-branding.rdf create mode 100644 xpfe/communicator/resources/locale/en-US/brand.dtd rename xpfe/{global => communicator}/resources/locale/en-US/brand.properties (100%) create mode 100755 xpfe/communicator/resources/locale/en-US/contents-branding.rdf 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 @@
- +
diff --git a/browser/base/jar.mn b/browser/base/jar.mn index 4a4a5ec3b781..ad4645e5a7b0 100644 --- a/browser/base/jar.mn +++ b/browser/base/jar.mn @@ -1,9 +1,6 @@ browser.jar: content/browser/contents.rdf (content/contents.rdf) content/browser-region/contents.rdf (content/contents-region.rdf) - content/browser/about.png (content/about.png) - content/browser/aboutCredits.png (content/aboutCredits.png) - content/browser/aboutFooter.png (content/aboutFooter.png) * content/browser/aboutDialog.xul (content/aboutDialog.xul) * content/browser/aboutDialog.js (content/aboutDialog.js) * content/browser/aboutDialog.css (content/aboutDialog.css) @@ -28,8 +25,15 @@ browser.jar: * content/browser/sanitize.xul (content/sanitize.xul) * content/browser/search.xml (content/search.xml) * content/browser/searchbarBindings.css (content/searchbarBindings.css) -* content/browser/searchconfig.properties (content/searchconfig.properties) * content/browser/setWallpaper.xul (content/setWallpaper.xul) * content/browser/utilityOverlay.js (content/utilityOverlay.js) * content/browser/web-panels.js (content/web-panels.js) * content/browser/web-panels.xul (content/web-panels.xul) +#ifndef MOZ_USE_OFFICIAL_BRANDING + content/branding/contents.rdf (branding/contents.rdf) + content/branding/about.png (branding/about.png) + content/branding/aboutCredits.png (branding/aboutCredits.png) + content/branding/aboutFooter.png (branding/aboutFooter.png) + content/branding/searchconfig.properties (branding/searchconfig.properties) + content/branding/icon64.png (branding/icon64.png) +#endif diff --git a/browser/components/bookmarks/content/bookmarks.js b/browser/components/bookmarks/content/bookmarks.js index 6cd67e9bea36..45a2eeb9eea4 100644 --- a/browser/components/bookmarks/content/bookmarks.js +++ b/browser/components/bookmarks/content/bookmarks.js @@ -1223,7 +1223,7 @@ var BookmarksUtils = { .getService(Components.interfaces.nsIStringBundleService); var bookmarksBundle = "chrome://browser/locale/bookmarks/bookmarks.properties"; this._bundle = BUNDLESVC.createBundle(bookmarksBundle, LOCALESVC.getApplicationLocale()); - var brandBundle = "chrome://global/locale/brand.properties"; + var brandBundle = "chrome://branding/locale/brand.properties"; this._brandShortName = BUNDLESVC.createBundle(brandBundle, LOCALESVC.getApplicationLocale()) .GetStringFromName("brandShortName"); } diff --git a/browser/components/history/content/history.js b/browser/components/history/content/history.js index 78e82b96666e..aaa7bd58836e 100644 --- a/browser/components/history/content/history.js +++ b/browser/components/history/content/history.js @@ -164,7 +164,7 @@ function checkURLSecurity(aURL) var promptService = Components.classes["@mozilla.org/embedcomp/prompt-service;1"] .getService(Components.interfaces.nsIPromptService); var historyBundle = strBundleService.createBundle("chrome://global/locale/history/history.properties"); - var brandBundle = strBundleService.createBundle("chrome://global/locale/brand.properties"); + var brandBundle = strBundleService.createBundle("chrome://branding/locale/brand.properties"); var brandStr = brandBundle.GetStringFromName("brandShortName"); var errorStr = historyBundle.GetStringFromName("load-js-data-url-error"); promptService.alert(window, brandStr, errorStr); diff --git a/browser/components/preferences/general.xul b/browser/components/preferences/general.xul index 0394a6de4819..b1bba7b24c01 100644 --- a/browser/components/preferences/general.xul +++ b/browser/components/preferences/general.xul @@ -34,7 +34,7 @@ type="bool"/> - + diff --git a/browser/components/shell/src/nsShellService.h b/browser/components/shell/src/nsShellService.h index 29a788b05b69..58e7eb68f761 100644 --- a/browser/components/shell/src/nsShellService.h +++ b/browser/components/shell/src/nsShellService.h @@ -37,5 +37,5 @@ #define PREF_CHECKDEFAULTBROWSER "browser.shell.checkDefaultBrowser" #define SHELLSERVICE_PROPERTIES "chrome://browser/locale/shellservice.properties" -#define BRAND_PROPERTIES "chrome://global/locale/brand.properties" +#define BRAND_PROPERTIES "chrome://branding/locale/brand.properties" diff --git a/browser/components/shell/src/nsWindowsShellService.cpp b/browser/components/shell/src/nsWindowsShellService.cpp index 7c87fcba2722..e14f35713998 100644 --- a/browser/components/shell/src/nsWindowsShellService.cpp +++ b/browser/components/shell/src/nsWindowsShellService.cpp @@ -744,7 +744,7 @@ nsWindowsShellService::SetDesktopBackground(nsIDOMElement* aElement, nsCOMPtr bundleService(do_GetService(bundleCID)); if (bundleService) { nsCOMPtr brandBundle; - rv = bundleService->CreateBundle("chrome://global/locale/brand.properties", + rv = bundleService->CreateBundle("chrome://branding/locale/brand.properties", getter_AddRefs(brandBundle)); if (NS_SUCCEEDED(rv) && brandBundle) { if (NS_FAILED(rv = brandBundle->GetStringFromName(NS_LITERAL_STRING("brandShortName").get(), diff --git a/browser/installer/unix/ab-CD.jst b/browser/installer/unix/ab-CD.jst index db763a733ee2..6ea42b0bf698 100644 --- a/browser/installer/unix/ab-CD.jst +++ b/browser/installer/unix/ab-CD.jst @@ -79,6 +79,7 @@ if (verifyDiskSpace(fProgram, srDest)) registerChrome(chromeType, cf, "locale/browser/"); registerChrome(chromeType, cf, "locale/browser-region/"); + registerChrome(chromeType, cf, "locale/branding/"); registerChrome(chromeType, cf, "locale/@AB_CD@/passwordmgr/"); registerChrome(chromeType, cf, "locale/@AB_CD@/mozapps/"); diff --git a/browser/installer/unix/browser.jst b/browser/installer/unix/browser.jst index b4ede1f0397d..578b1a379240 100644 --- a/browser/installer/unix/browser.jst +++ b/browser/installer/unix/browser.jst @@ -92,6 +92,7 @@ if (verifyDiskSpace(communicatorFolder, srDest)) // register chrome registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome", "browser.jar"), "content/browser/"); + registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome", "browser.jar"), "content/branding/"); registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome", "classic.jar"), "skin/classic/browser/"); registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome", "browser.jar"), "content/browser-region/"); diff --git a/browser/installer/windows/ab-CD.jst b/browser/installer/windows/ab-CD.jst index 2f98d5b6126e..a1ee855d6841 100644 --- a/browser/installer/windows/ab-CD.jst +++ b/browser/installer/windows/ab-CD.jst @@ -80,6 +80,7 @@ if(verifyDiskSpace(fProgram, srDest)) registerChrome(chromeType, cf, "locale/browser/"); registerChrome(chromeType, cf, "locale/browser-region/"); + registerChrome(chromeType, cf, "locale/branding/"); registerChrome(chromeType, cf, "locale/@AB_CD@/passwordmgr/"); registerChrome(chromeType, cf, "locale/@AB_CD@/mozapps/"); diff --git a/browser/installer/windows/browser.jst b/browser/installer/windows/browser.jst index e17caf472291..1a4547a95c97 100644 --- a/browser/installer/windows/browser.jst +++ b/browser/installer/windows/browser.jst @@ -525,6 +525,7 @@ if(verifyDiskSpace(fProgram, srDest)) // register chrome registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome", "browser.jar"), "content/browser/"); + registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome", "browser.jar"), "content/branding/"); registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome", "classic.jar"), "skin/classic/browser/"); registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome", "browser.jar"), "content/browser-region/"); registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome", "browser.jar"), "content/browser-platform/"); diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in index 063687914a3b..76bbac3e4149 100644 --- a/browser/locales/Makefile.in +++ b/browser/locales/Makefile.in @@ -53,6 +53,10 @@ APP_VERSION := $(shell cat $(srcdir)/../config/version.txt) DEFINES += -DAB_CD=$(AB_CD) -DAPP_VERSION=$(MOZ_APP_VERSION) +ifdef MOZ_USE_OFFICIAL_BRANDING +DEFINES += -DMOZ_USE_OFFICIAL_BRANDING +endif + ifeq (,$(filter-out pref,$(MOZ_EXTENSIONS))) DEFINES += -DEXTENSION_PREF endif diff --git a/browser/locales/en-US/chrome/branding/brand.dtd b/browser/locales/en-US/chrome/branding/brand.dtd new file mode 100755 index 000000000000..2fbaf81273a7 --- /dev/null +++ b/browser/locales/en-US/chrome/branding/brand.dtd @@ -0,0 +1,5 @@ + + + + + diff --git a/browser/locales/en-US/chrome/branding/brand.properties b/browser/locales/en-US/chrome/branding/brand.properties new file mode 100755 index 000000000000..dc739f0c5ab3 --- /dev/null +++ b/browser/locales/en-US/chrome/branding/brand.properties @@ -0,0 +1,3 @@ +brandShortName=Browser +brandFullName=Gecko Browser +vendorShortName=Generic diff --git a/browser/locales/generic/chrome/branding/contents.rdf b/browser/locales/generic/chrome/branding/contents.rdf new file mode 100755 index 000000000000..c26074bf13fd --- /dev/null +++ b/browser/locales/generic/chrome/branding/contents.rdf @@ -0,0 +1,21 @@ + + +#filter substitution + + + + + + + + + + + + + + + + + diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn index fac72b811e63..a67548519b89 100644 --- a/browser/locales/jar.mn +++ b/browser/locales/jar.mn @@ -1,8 +1,6 @@ #filter substitution @AB_CD@.jar: -* locale/@AB_CD@/global/brand.dtd (%chrome/global/brand.dtd) -+ locale/@AB_CD@/global/brand.properties (%chrome/global/brand.properties) * locale/browser/contents.rdf (generic/chrome/browser/contents.rdf) locale/browser/aboutDialog.dtd (%chrome/browser/aboutDialog.dtd) locale/browser/credits.dtd (%chrome/browser/credits.dtd) @@ -56,4 +54,9 @@ * locale/@AB_CD@/cookie/contents.rdf (generic/chrome/cookie/contents.rdf) locale/@AB_CD@/cookie/cookieAcceptDialog.dtd (%chrome/cookie/cookieAcceptDialog.dtd) locale/@AB_CD@/cookie/cookieAcceptDialog.properties (%chrome/cookie/cookieAcceptDialog.properties) +#ifndef MOZ_USE_OFFICIAL_BRANDING +* locale/branding/contents.rdf (generic/chrome/branding/contents.rdf) + locale/branding/brand.dtd (%chrome/branding/brand.dtd) + locale/branding/brand.properties (%chrome/branding/brand.properties) +#endif #includesubst @AB_CD@/extra-jar.mn diff --git a/extensions/p3p/resources/content/nsPolicyViewer.js b/extensions/p3p/resources/content/nsPolicyViewer.js index fa86dc54c14a..11f0e3da27e8 100755 --- a/extensions/p3p/resources/content/nsPolicyViewer.js +++ b/extensions/p3p/resources/content/nsPolicyViewer.js @@ -620,7 +620,7 @@ function getBundle () function getBrandName () { if (!gBrandName) { - var brandBundle = getStrBundleService().createBundle("chrome://global/locale/brand.properties"); + var brandBundle = getStrBundleService().createBundle("chrome://branding/locale/brand.properties"); gBrandName = brandBundle.GetStringFromName("brandShortName") } return gBrandName; diff --git a/layout/printing/nsPrintData.cpp b/layout/printing/nsPrintData.cpp index 306bb4257d08..a554b316bffa 100644 --- a/layout/printing/nsPrintData.cpp +++ b/layout/printing/nsPrintData.cpp @@ -89,7 +89,7 @@ nsPrintData::nsPrintData(ePrintDataType aType) : nsCOMPtr brandBundle; nsCOMPtr svc( do_GetService( NS_STRINGBUNDLE_CONTRACTID ) ); if (svc) { - svc->CreateBundle( "chrome://global/locale/brand.properties", getter_AddRefs( brandBundle ) ); + svc->CreateBundle( "chrome://branding/locale/brand.properties", getter_AddRefs( brandBundle ) ); if (brandBundle) { brandBundle->GetStringFromName(NS_LITERAL_STRING("brandShortName").get(), &mBrandName ); } diff --git a/mail/base/Makefile.in b/mail/base/Makefile.in index 6b01c860e6cc..0e98df0d9bd0 100644 --- a/mail/base/Makefile.in +++ b/mail/base/Makefile.in @@ -42,6 +42,10 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk +ifdef MOZ_USE_OFFICIAL_BRANDING +DEFINES += -DMOZ_USE_OFFICIAL_BRANDING +endif + ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT))) DIRS += skin/mac else @@ -49,4 +53,3 @@ else endif include $(topsrcdir)/config/rules.mk - diff --git a/mail/base/content/ABSearchDialog.xul b/mail/base/content/ABSearchDialog.xul index 3ce289eebd08..11d4a075dd3a 100644 --- a/mail/base/content/ABSearchDialog.xul +++ b/mail/base/content/ABSearchDialog.xul @@ -65,7 +65,7 @@ - + diff --git a/mail/base/content/SearchDialog.xul b/mail/base/content/SearchDialog.xul index 37b35b726094..da5871f1d1cf 100644 --- a/mail/base/content/SearchDialog.xul +++ b/mail/base/content/SearchDialog.xul @@ -58,7 +58,7 @@ - + - + diff --git a/toolkit/mozapps/update/content/update.xul b/toolkit/mozapps/update/content/update.xul index 3f9d14b4e449..9eff063b1fc8 100644 --- a/toolkit/mozapps/update/content/update.xul +++ b/toolkit/mozapps/update/content/update.xul @@ -63,7 +63,7 @@