diff options
| author | pinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-30 16:50:45 +0000 |
|---|---|---|
| committer | pinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-30 16:50:45 +0000 |
| commit | e93e2d621b2733390169907435254ef2b5089293 (patch) | |
| tree | f74e7e5961e8e49980d949b19346d960db615ff0 /chrome | |
| parent | 1eef4016c6c8074e9de1efc63711d644eb55d320 (diff) | |
| download | chromium_src-e93e2d621b2733390169907435254ef2b5089293.zip chromium_src-e93e2d621b2733390169907435254ef2b5089293.tar.gz chromium_src-e93e2d621b2733390169907435254ef2b5089293.tar.bz2 | |
Get rid of redundant tab layout by installing incognito badge and adjusting tab strip before creating the tab strip controller.
BUG=none
TEST=initial incognito tab layout should exactly match normal tab layout (including new tab button).
Review URL: http://codereview.chromium.org/160397
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22060 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/cocoa/browser_window_controller.mm | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome/browser/cocoa/browser_window_controller.mm b/chrome/browser/cocoa/browser_window_controller.mm index ce68077..d8c801b 100644 --- a/chrome/browser/cocoa/browser_window_controller.mm +++ b/chrome/browser/cocoa/browser_window_controller.mm @@ -151,6 +151,10 @@ willPositionSheet:(NSWindow*)sheet windowRect.set_height(minSize.height); windowShim_->SetBounds(windowRect); + // Puts the incognito badge on the window frame, if necessary. Do this + // before creating the tab strip to avoid redundant tab layout. + [self installIncognitoBadge]; + // Create a controller for the tab strip, giving it the model object for // this window's Browser and the tab strip view. The controller will handle // registering for the appropriate tab notifications from the back-end and @@ -160,9 +164,6 @@ willPositionSheet:(NSWindow*)sheet switchView:[self tabContentArea] model:browser_->tabstrip_model()]); - // Puts the incognito badge on the window frame, if necessary. - [self installIncognitoBadge]; - // Create the infobar container view, so we can pass it to the // ToolbarController, but do not position the view until after the // toolbar is in place, as positionToolbar will move the tab content area. |