Instantiate AppShimMenuController when app launcher is enabled. (Mac)

chrome/browser/app_controller_mac.mm

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "chrome/browser/app_controller_mac.h"
 
 #include "apps/app_shim/app_shim_mac.h"
 #include "apps/app_shim/extension_app_shim_handler_mac.h"
 #include "apps/shell_window_registry.h"
 #include "base/auto_reset.h"
@@ skipping 663 matching lines @@
 // It is safe to access the default profile here.
 - (void)applicationDidFinishLaunching:(NSNotification*)notify {
   // Notify BrowserList to keep the application running so it doesn't go away
   // when all the browser windows get closed.
   chrome::StartKeepAlive();
 
   [self setUpdateCheckInterval];
 
   // Start managing the menu for app windows. This needs to be done here because
   // main menu item titles are not yet initialized in awakeFromNib.
-  if (apps::IsAppShimsEnabled())
-    appShimMenuController_.reset([[AppShimMenuController alloc] init]);
+  [self initAppShimMenuController];

[Nico, 2013/11/04 00:22:58]

I meant "can you keep the `if (apps::IsAppShimsEnabled())` here" (and alloc the
AppShimMenuController elsewhere if it turns out to be needed later)

…err nevermind, you just moved the if into another function. Sorry.

 
   // Build up the encoding menu, the order of the items differs based on the
   // current locale (see http://crbug.com/7647 for details).
   // We need a valid g_browser_process to get the profile which is why we can't
   // call this from awakeFromNib.
   NSMenu* viewMenu = [[[NSApp mainMenu] itemWithTag:IDC_VIEW_MENU] submenu];
   NSMenuItem* encodingMenuItem = [viewMenu itemWithTag:IDC_ENCODING_MENU];
   NSMenu* encodingMenu = [encodingMenuItem submenu];
   EncodingMenuControllerDelegate::BuildEncodingMenu([self lastProfile],
                                                     encodingMenu);
@@ skipping 758 matching lines @@
 }
 
 - (void)addObserverForWorkAreaChange:(ui::WorkAreaWatcherObserver*)observer {
   workAreaChangeObservers_.AddObserver(observer);
 }
 
 - (void)removeObserverForWorkAreaChange:(ui::WorkAreaWatcherObserver*)observer {
   workAreaChangeObservers_.RemoveObserver(observer);
 }
 
+- (void)initAppShimMenuController {
+  if (apps::IsAppShimsEnabled() && !appShimMenuController_)
+    appShimMenuController_.reset([[AppShimMenuController alloc] init]);
+}
+
 - (void)applicationDidChangeScreenParameters:(NSNotification*)notification {
   // During this callback the working area is not always already updated. Defer.
   [self performSelector:@selector(delayedScreenParametersUpdate)
              withObject:nil
              afterDelay:0];
 }
 
 - (void)delayedScreenParametersUpdate {
   FOR_EACH_OBSERVER(ui::WorkAreaWatcherObserver, workAreaChangeObservers_,
       WorkAreaChanged());
 }
 
 @end  // @implementation AppController
 
 //---------------------------------------------------------------------------
 
 namespace app_controller_mac {
 
 bool IsOpeningNewWindow() {
   return g_is_opening_new_window;
 }
 
 }  // namespace app_controller_mac