diff options
| author | thomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-26 12:41:40 +0000 |
|---|---|---|
| committer | thomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-26 12:41:40 +0000 |
| commit | 4b0d2dd2046099d9602aa256bde12a6634afcca5 (patch) | |
| tree | b958bf27de5ce5fc0299e1e8671251ff92ad39d0 /chrome/browser/browser_main.cc | |
| parent | b2abac7f32280c9d8bd0fd0d23c5432701634807 (diff) | |
| download | chromium_src-4b0d2dd2046099d9602aa256bde12a6634afcca5.zip chromium_src-4b0d2dd2046099d9602aa256bde12a6634afcca5.tar.gz chromium_src-4b0d2dd2046099d9602aa256bde12a6634afcca5.tar.bz2 | |
Wire up resource bundles on the mac:
- compile resource_bundle
- add resource_bundle_mac by cloning the linux and using some NSBundle to find
the files.
- enable resource bundles on the mac in the calling code.
- added script to app target to repack .pak files into larger chunks (chrome,
theme, and localized bits).
- added script to copy repacked files into the app bundle.
Review URL: http://codereview.chromium.org/28171
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10460 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_main.cc')
| -rw-r--r-- | chrome/browser/browser_main.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc index 88c5978..0693cd1 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -306,7 +306,6 @@ int BrowserMain(const MainFunctionParams& parameters) { parent_local_state.GetString(prefs::kApplicationLocale)); } -#if defined(OS_WIN) || defined(OS_LINUX) // If we're running tests (ui_task is non-null), then the ResourceBundle // has already been initialized. if (!parameters.ui_task) { @@ -315,7 +314,6 @@ int BrowserMain(const MainFunctionParams& parameters) { // We only load the theme dll in the browser process. ResourceBundle::GetSharedInstance().LoadThemeResources(); } -#endif // defined(OS_WIN) || defined(OS_LINUX) if (!parsed_command_line.HasSwitch(switches::kNoErrorDialogs)) { // Display a warning if the user is running windows 2000. |