| Index: chrome/browser/app_controller_mac.mm
|
| ===================================================================
|
| --- chrome/browser/app_controller_mac.mm (revision 21206)
|
| +++ chrome/browser/app_controller_mac.mm (working copy)
|
| @@ -18,7 +18,6 @@
|
| #import "chrome/browser/cocoa/bookmark_menu_bridge.h"
|
| #import "chrome/browser/cocoa/clear_browsing_data_controller.h"
|
| #import "chrome/browser/cocoa/encoding_menu_controller_delegate_mac.h"
|
| -#import "chrome/browser/cocoa/menu_localizer.h"
|
| #import "chrome/browser/cocoa/preferences_window_controller.h"
|
| #import "chrome/browser/cocoa/tab_strip_controller.h"
|
| #import "chrome/browser/cocoa/tab_window_controller.h"
|
| @@ -28,6 +27,7 @@
|
| #include "chrome/common/pref_service.h"
|
| #include "chrome/browser/profile_manager.h"
|
| #include "chrome/common/temp_scaffolding_stubs.h"
|
| +#import "xib_localizers/main_menu_localizer.h"
|
|
|
| @interface AppController(PRIVATE)
|
| - (void)initMenuState;
|
| @@ -215,12 +215,14 @@
|
| 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<MenuLocalizer> localizer(
|
| - [[MenuLocalizer alloc] initWithBundle:nil]);
|
| + scoped_nsobject<MainMenuLocalizer> localizer(
|
| + [[MainMenuLocalizer alloc] initWithBundle:nil]);
|
| [localizer localizeObject:[NSApplication sharedApplication]
|
| recursively:YES];
|
|
|
|
|