Merge 41644 - [Mac] Add support for showing extensions in incognito mode, whi...

chrome/browser/cocoa/browser_window_controller.mm

 // Copyright (c) 2010 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/cocoa/browser_window_controller.h"
 
 #include <Carbon/Carbon.h>
 
 #include "app/l10n_util_mac.h"
 #include "base/mac_util.h"
@@ skipping 283 matching lines @@
                 name:NSApplicationDidHideNotification
               object:nil];
     [[NSNotificationCenter defaultCenter]
          addObserver:self
             selector:@selector(applicationDidUnhide:)
                 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];
+    if ([self hasToolbar])  // Do not create the buttons in popups.
+      [toolbarController_ createBrowserActionButtons];
 
     // We are done initializing now.
     initializing_ = NO;
   }
   return self;
 }
 
 - (void)dealloc {
   browser_->CloseAllTabs();
   [downloadShelfController_ exiting];
@@ skipping 1498 matching lines @@
 
 - (BOOL)supportsBookmarkBar {
   return [self supportsWindowFeature:Browser::FEATURE_BOOKMARKBAR];
 }
 
 - (BOOL)isNormalWindow {
   return browser_->type() == Browser::TYPE_NORMAL;
 }
 
 @end  // @implementation BrowserWindowController(WindowType)