diff options
| author | andybons@chromium.org <andybons@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-15 22:06:45 +0000 |
|---|---|---|
| committer | andybons@chromium.org <andybons@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-15 22:06:45 +0000 |
| commit | 5ee5bef87e0d0ff6506aea55e3310e59ef767b14 (patch) | |
| tree | cbcbeb869d5fd2e78199b7ed8be77379e5d85eb5 /chrome/browser/cocoa/browser_window_controller.mm | |
| parent | 83dd4d1b3402a1b3d6f19f6676ebe5597053f467 (diff) | |
| download | chromium_src-5ee5bef87e0d0ff6506aea55e3310e59ef767b14.zip chromium_src-5ee5bef87e0d0ff6506aea55e3310e59ef767b14.tar.gz chromium_src-5ee5bef87e0d0ff6506aea55e3310e59ef767b14.tar.bz2 | |
[Mac] Add support for showing extensions in incognito mode, while fixing a bug where the Browser Actions container was displayed and sized in a popup window.
TEST=none.
BUG=38094
Review URL: http://codereview.chromium.org/1001001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41644 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa/browser_window_controller.mm')
| -rw-r--r-- | chrome/browser/cocoa/browser_window_controller.mm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/cocoa/browser_window_controller.mm b/chrome/browser/cocoa/browser_window_controller.mm index 209604d..61fad98 100644 --- a/chrome/browser/cocoa/browser_window_controller.mm +++ b/chrome/browser/cocoa/browser_window_controller.mm @@ -299,7 +299,8 @@ // 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; |