diff options
author | thomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-12 20:33:05 +0000 |
---|---|---|
committer | thomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-12 20:33:05 +0000 |
commit | 885b72726cd788273b305da33d04c65cfa130d09 (patch) | |
tree | bb23ed9f0f54655773ec102b10eb234c69090f0e /chrome/browser/app_controller_mac.mm | |
parent | e56861937b3bdea9ecafc082f6dd29c52bd16bee (diff) | |
download | chromium_src-885b72726cd788273b305da33d04c65cfa130d09.zip chromium_src-885b72726cd788273b305da33d04c65cfa130d09.tar.gz chromium_src-885b72726cd788273b305da33d04c65cfa130d09.tar.bz2 |
Move the menu bar l10n into the xib file.
Localize the menu bar titles.
Have the browser platform delegate startup the resource bundle system so we can fetch localization data.
Make l10n_util::GetApplicationLocale return what cocoa says for the language so we match what the UI is using.
TEST=everything still works.
BUG=17380
Review URL: http://codereview.chromium.org/164413
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23215 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/app_controller_mac.mm')
-rw-r--r-- | chrome/browser/app_controller_mac.mm | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/chrome/browser/app_controller_mac.mm b/chrome/browser/app_controller_mac.mm index 40ccaad..ccec4f9 100644 --- a/chrome/browser/app_controller_mac.mm +++ b/chrome/browser/app_controller_mac.mm @@ -26,7 +26,6 @@ #import "chrome/browser/cocoa/preferences_window_controller.h" #import "chrome/browser/cocoa/tab_strip_controller.h" #import "chrome/browser/cocoa/tab_window_controller.h" -#import "chrome/browser/cocoa/ui_localizer.h" #include "chrome/browser/command_updater.h" #include "chrome/browser/download/download_manager.h" #include "chrome/browser/tab_contents/tab_contents.h" @@ -264,17 +263,6 @@ DCHECK(g_browser_process); g_browser_process->AddRefModule(); - // TODO: move this into the MainMenu.xib once we clean up the startup order - // dependencies so that works. http://crbug.com/17380 - // Create the localizer for the main menu. We can't do this in the nib - // because it's too early. Do it before we create any bookmark menus as well, - // just in case one has a title that matches any of our strings (unlikely, - // but technically possible). - scoped_nsobject<ChromeUILocalizer> localizer( - [[ChromeUILocalizer alloc] initWithBundle:nil]); - [localizer localizeObject:[NSApplication sharedApplication] - recursively:YES]; - bookmarkMenuBridge_.reset(new BookmarkMenuBridge()); historyMenuBridge_.reset(new HistoryMenuBridge([self defaultProfile])); |