Initial cut at scaffolding for mac sidetabs. No visible changes to browser wi...

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 215 matching lines @@
 
     windowShim_->SetBounds(windowRect);
 
     // Puts the incognito badge on the window frame, if necessary.
     [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
     // managing the creation of new tabs.
-    tabStripController_.reset([[TabStripController alloc]
-                                initWithView:[self tabStripView]
-                                  switchView:[self tabContentArea]
-                                     browser:browser_.get()]);
+    if (![self useVerticalTabs]) {
+      tabStripController_.reset([[TabStripController alloc]
+                                  initWithView:[self tabStripView]
+                                    switchView:[self tabContentArea]
+                                       browser:browser_.get()]);
+    } else {
+      // XXXPINK: load SideTabController when written and add it to the

[rohitrao (ping after 24h), 2010/06/02 13:45:56]

Is this a TODO or a DO NOT SUBMIT?

+      // contentView.
+    }
 
     // Create the infobar container view, so we can pass it to the
     // ToolbarController.
     infoBarContainerController_.reset(
         [[InfoBarContainerController alloc]
           initWithTabStripModel:(browser_->tabstrip_model())
                  resizeDelegate:self]);
     [[[self window] contentView] addSubview:[infoBarContainerController_ view]];
 
     // Create a controller for the toolbar, giving it the toolbar model object
     // and the toolbar view from the nib. The controller will handle
     // registering for the appropriate command state changes from the back-end.
-    toolbarController_.reset([[ToolbarController alloc]
-                               initWithModel:browser->toolbar_model()
-                                    commands:browser->command_updater()
-                                     profile:browser->profile()
-                                     browser:browser
-                              resizeDelegate:self]);
-    [toolbarController_ setHasToolbar:[self hasToolbar]
-                       hasLocationBar:[self hasLocationBar]];
-    [[[self window] contentView] addSubview:[toolbarController_ view]];
+    // Adds the toolbar to the content area.
+    [self initializeToolbarWithBrowser:browser];
 
     // Create a sub-controller for the bookmark bar.
     bookmarkBarController_.reset(
         [[BookmarkBarController alloc]
             initWithBrowser:browser_.get()
                initialWidth:NSWidth([[[self window] contentView] frame])
                    delegate:self
              resizeDelegate:self]);
 
     // Add bookmark bar to the view hierarchy, which also triggers the nib load.
@@ skipping 1011 matching lines @@
   return base::SysUTF16ToNSString(contents->GetTitle());
 }
 
 - (NSRect)regularWindowFrame {
   return [self isFullscreen] ? [savedRegularWindow_ frame] :
                                [[self window] frame];
 }
 
 // (Override of |TabWindowController| method.)
 - (BOOL)hasTabStrip {
+  if ([self useVerticalTabs])
+    return NO;
   return [self supportsWindowFeature:Browser::FEATURE_TABSTRIP];
 }
 
 - (void)selectTabWithContents:(TabContents*)newContents
              previousContents:(TabContents*)oldContents
                       atIndex:(NSInteger)index
                   userGesture:(bool)wasUserGesture {
   DCHECK(oldContents != newContents);
 
   // Update various elements that are interested in knowing the current
@@ skipping 316 matching lines @@
           [controller getDesiredToolbarHeightCompression]];
 }
 
 // (Private/TestingAPI)
 - (void)resetWindowGrowthState {
   windowTopGrowth_ = 0;
   windowBottomGrowth_ = 0;
   isShrinkingFromZoomed_ = NO;
 }
 
+- (void)tabStripDisplayModeChanged {
+  //XXXPINK re-initialize tab strip

[rohitrao (ping after 24h), 2010/06/02 13:45:56]

TODO?

This method is only half written, right?  When finished, it'll need to remove
the old tabstrip and toolbar, create both new controllers, and install the two
new views.  I think.

+  // [self initTabStrip:browser_->tabstrip_model()];
+  [[self tabStripView] removeFromSuperview];
+  [self initializeToolbarWithBrowser:browser_.get()];
+
+  [self layoutSubviews];
+}
+
 @end  // @implementation BrowserWindowController
 
 
 @implementation BrowserWindowController(Fullscreen)
 
 - (void)setFullscreen:(BOOL)fullscreen {
   // The logic in this function is a bit complicated and very carefully
   // arranged.  See the below comments for more details.
 
   if (fullscreen == [self isFullscreen])
@@ skipping 208 matching lines @@
 
 - (BOOL)supportsBookmarkBar {
   return [self supportsWindowFeature:Browser::FEATURE_BOOKMARKBAR];
 }
 
 - (BOOL)isNormalWindow {
   return browser_->type() == Browser::TYPE_NORMAL;
 }
 
 @end  // @implementation BrowserWindowController(WindowType)