Merge 41114 - [Mac] More progress towards resizing the Browser Actions contai...

chrome/browser/cocoa/browser_window_controller.mm

Index: chrome/browser/cocoa/browser_window_controller.mm
===================================================================
--- chrome/browser/cocoa/browser_window_controller.mm	(revision 41123)
+++ chrome/browser/cocoa/browser_window_controller.mm	(working copy)
@@ -256,10 +256,6 @@
                        hasLocationBar:[self hasLocationBar]];
     [[[self window] contentView] addSubview:[toolbarController_ view]];
 
-    // This must be done after the view is added to the window since it relies
-    // on the window bounds to determine whether to show buttons or not.
-    [toolbarController_ createBrowserActionButtons];
-
     // Create a sub-controller for the bookmark bar.
     bookmarkBarController_.reset(
         [[BookmarkBarController alloc]
@@ -303,6 +299,10 @@
                 name:NSApplicationDidUnhideNotification
               object:nil];
 
+    // This must be done after the view is added to the window since it relies
+    // on the window bounds to determine whether to show buttons or not.
+    [toolbarController_ createBrowserActionButtons];
+
     // We are done initializing now.
     initializing_ = NO;
   }