[Extension Toolbar] Refactor and finish pop out logic for actions

chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.mm

 // Copyright (c) 2011 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/ui/cocoa/wrench_menu/wrench_menu_controller.h"
 
 #include "base/basictypes.h"
 #include "base/mac/bundle_locations.h"
 #include "base/mac/mac_util.h"
 #include "base/strings/string16.h"
 #include "base/strings/sys_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #import "chrome/browser/app_controller_mac.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #import "chrome/browser/ui/cocoa/accelerators_cocoa.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.h"
+#import "chrome/browser/ui/cocoa/browser_window_controller.h"
 #import "chrome/browser/ui/cocoa/extensions/browser_actions_container_view.h"
 #import "chrome/browser/ui/cocoa/extensions/browser_actions_controller.h"
 #import "chrome/browser/ui/cocoa/encoding_menu_controller_delegate_mac.h"
 #import "chrome/browser/ui/cocoa/l10n_util.h"
 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
 #import "chrome/browser/ui/cocoa/wrench_menu/menu_tracked_root_view.h"
 #import "chrome/browser/ui/cocoa/wrench_menu/recent_tabs_menu_model_delegate.h"
 #include "chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h"
 #include "chrome/browser/ui/toolbar/wrench_menu_model.h"
 #include "chrome/grit/generated_resources.h"
@@ skipping 100 matching lines @@
   // Handle the special-cased menu items.
   base::scoped_nsobject<NSMenuItem> customItem(
       [[NSMenuItem alloc] initWithTitle:@"" action:nil keyEquivalent:@""]);
   MenuTrackedRootView* view = nil;
   switch (command_id) {
     case IDC_EXTENSIONS_OVERFLOW_MENU: {
       view = [buttonViewController_ toolbarActionsOverflowItem];
       BrowserActionsContainerView* containerView =
           [buttonViewController_ overflowActionsContainerView];
 
+      // The overflow browser actions container can't function properly without
+      // a main counterpart, so if the browser window hasn't initialized, abort.
+      // (This is fine because we re-populate the wrench menu each time before
+      // we show it.)
+      if (!browser_->window())
+        break;
+
+      BrowserActionsController* mainController =
+          [[[BrowserWindowController browserWindowControllerForWindow:browser_->
+              window()->GetNativeWindow()] toolbarController]
+                  browserActionsController];
       browserActionsController_.reset(
           [[BrowserActionsController alloc]
               initWithBrowser:browser_
                 containerView:containerView
-                   isOverflow:YES]);
+               mainController:mainController]);
 
       // Set the origins and preferred size for the container.
       gfx::Size preferredSize = [browserActionsController_ preferredSize];
       NSSize preferredNSSize = NSMakeSize(preferredSize.width(),
                                           preferredSize.height());
       // View hierarchy is as follows (from parent > child):
       // |view| > |anonymous view| > containerView. We have to set the origin
       // and size of each for it display properly.
       [view setFrameSize:preferredNSSize];
       [view setFrameOrigin:NSMakePoint(0, 0)];
@@ skipping 283 matching lines @@
     controller_ = controller;
   }
   return self;
 }
 
 - (IBAction)dispatchWrenchMenuCommand:(id)sender {
   [controller_ dispatchWrenchMenuCommand:sender];
 }
 
 @end  // @implementation WrenchMenuButtonViewController