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

chrome/browser/cocoa/browser_window_controller_private.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_private.h"
 
 #include "base/mac_util.h"
 #import "base/scoped_nsobject.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_theme_provider.h"
 #import "chrome/browser/cocoa/chrome_browser_window.h"
 #import "chrome/browser/cocoa/fast_resize_view.h"
 #import "chrome/browser/cocoa/find_bar_cocoa_controller.h"
 #import "chrome/browser/cocoa/floating_bar_backing_view.h"
 #import "chrome/browser/cocoa/fullscreen_controller.h"
+#import "chrome/browser/cocoa/side_tabs_toolbar_controller.h"
 #import "chrome/browser/cocoa/tab_strip_controller.h"
 #import "chrome/browser/cocoa/tab_strip_view.h"
 #import "chrome/browser/cocoa/toolbar_controller.h"
 #include "chrome/browser/pref_service.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/renderer_host/render_widget_host_view.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tab_contents/tab_contents_view.h"
 #include "chrome/common/pref_names.h"
 
 
 namespace {
 
 // Space between the incognito badge and the right edge of the window.
 const CGFloat kIncognitoBadgeOffset = 4;
 
 // Insets for the location bar, used when the full toolbar is hidden.
 // TODO(viettrungluu): We can argue about the "correct" insetting; I like the
 // following best, though arguably 0 inset is better/more correct.
 const CGFloat kLocBarLeftRightInset = 1;
 const CGFloat kLocBarTopInset = 0;
 const CGFloat kLocBarBottomInset = 1;
 
 }  // end namespace
 
 
 @implementation BrowserWindowController(Private)
 
+- (BOOL)useVerticalTabs {
+  return browser_->tabstrip_model()->delegate()->UseVerticalTabs();
+}
+
 - (void)saveWindowPositionIfNeeded {
   if (browser_ != BrowserList::GetLastActive())
     return;
 
   if (!g_browser_process || !g_browser_process->local_state() ||
       !browser_->ShouldSaveWindowPlacement())
     return;
 
   [self saveWindowPositionToPrefs:g_browser_process->local_state()];
 }
@@ skipping 73 matching lines @@
 }
 
 - (void)layoutSubviews {
   // With the exception of the tab strip, the subviews which we lay out are
   // subviews of the content view, so we mainly work in the content view's
   // coordinate system. Note, however, that the content view's coordinate system
   // and the window's base coordinate system should coincide.
   NSWindow* window = [self window];
   NSView* contentView = [window contentView];
   NSRect contentBounds = [contentView bounds];
+  CGFloat minX = NSMinX(contentBounds);
   CGFloat minY = NSMinY(contentBounds);
   CGFloat width = NSWidth(contentBounds);
 
   // Suppress title drawing if necessary.
   if ([window respondsToSelector:@selector(setShouldHideTitle:)])
     [(id)window setShouldHideTitle:![self hasTitleBar]];
 
   BOOL isFullscreen = [self isFullscreen];
   CGFloat floatingBarHeight = [self floatingBarHeight];
   // In fullscreen mode, |yOffset| accounts for the sliding position of the
   // floating bar and the extra offset needed to dodge the menu bar.
   CGFloat yOffset = isFullscreen ?
       (floor((1 - floatingBarShownFraction_) * floatingBarHeight) -
           [fullscreenController_ floatingBarVerticalOffset]) : 0;
   CGFloat maxY = NSMaxY(contentBounds) + yOffset;
   CGFloat startMaxY = maxY;
 
   if ([self hasTabStrip]) {
     // If we need to lay out the tab strip, replace |maxY| and |startMaxY| with
     // higher values, and then lay out the tab strip.
     NSRect windowFrame = [contentView convertRect:[window frame] fromView:nil];
     startMaxY = maxY = NSHeight(windowFrame) + yOffset;
     maxY = [self layoutTabStripAtMaxY:maxY width:width fullscreen:isFullscreen];
   }
 
   // Sanity-check |maxY|.
   DCHECK_GE(maxY, minY);
   DCHECK_LE(maxY, NSMaxY(contentBounds) + yOffset);
 
-  // Place the toolbar at the top of the reserved area.
+  // Place the toolbar at the top of the reserved area. Even with vertical
+  // tabs enabled, the toolbar takes up the entire top width.

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

Looking at the mocks you sent me, I'd argue that the toolbar is the same width
as the web, and the sidebar stretches all the way to the top of the screen, but
this is easy enough to fix later.

   maxY = [self layoutToolbarAtMaxY:maxY width:width];
 
+  // Position the vertical tab strip on the left, taking up the entire remaining
+  // height.
+  // TODO(pinkerton): Make width not fixed.
+  const CGFloat kSidebarWidth = 200.0;
+  if ([self useVerticalTabs]) {
+    // XXXPINK position the side bar at |minX|.

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

TODO?

+
+    // Push everything else over to the right.
+    minX += kSidebarWidth;
+    width -= kSidebarWidth;
+  }
+
   // If we're not displaying the bookmark bar below the infobar, then it goes
   // immediately below the toolbar.
   BOOL placeBookmarkBarBelowInfoBar = [self placeBookmarkBarBelowInfoBar];
   if (!placeBookmarkBarBelowInfoBar)
-    maxY = [self layoutBookmarkBarAtMaxY:maxY width:width];
+    maxY = [self layoutBookmarkBarAtMinX:minX maxY:maxY width:width];
 
   // The floating bar backing view doesn't actually add any height.

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

This is fine for now, but we'll probably end up re-thinking how fullscreen mode
and side tabs interact.  The floating bar tabstrip doesn't really work.

-  [self layoutFloatingBarBackingViewAtY:maxY
-                                  width:width
-                                 height:floatingBarHeight
-                             fullscreen:isFullscreen];
+  NSRect floatingBarBackingRect =
+      NSMakeRect(minX, minY, width, floatingBarHeight);
+  [self layoutFloatingBarBackingView:floatingBarBackingRect
+                          fullscreen:isFullscreen];
 
   // Place the find bar immediately below the toolbar/attached bookmark bar. In
   // fullscreen mode, it hangs off the top of the screen when the bar is hidden.
+  // The find bar is unaffected by the side tab positioning.
   [findBarCocoaController_ positionFindBarViewAtMaxY:maxY maxWidth:width];
 
   // If in fullscreen mode, reset |maxY| to top of screen, so that the floating
   // bar slides over the things which appear to be in the content area.
   if (isFullscreen)
     maxY = NSMaxY(contentBounds);
 
   // Also place the infobar container immediate below the toolbar, except in
   // fullscreen mode in which case it's at the top of the visual content area.
-  maxY = [self layoutInfoBarAtMaxY:maxY width:width];
+  maxY = [self layoutInfoBarAtMinX:minX maxY:maxY width:width];
 
   // If the bookmark bar is detached, place it next in the visual content area.
   if (placeBookmarkBarBelowInfoBar)
-    maxY = [self layoutBookmarkBarAtMaxY:maxY width:width];
+    maxY = [self layoutBookmarkBarAtMinX:minX maxY:maxY width:width];
 
   // Place the download shelf, if any, at the bottom of the view.
-  minY = [self layoutDownloadShelfAtMinY:minY width:width];
+  minY = [self layoutDownloadShelfAtMinX:minX minY:minY width:width];
 
   // Finally, the content area takes up all of the remaining space.
-  [self layoutTabContentAreaAtMinY:minY maxY:maxY width:width];
+  NSRect contentAreaRect = NSMakeRect(minX, minY, width, maxY - minY);
+  [self layoutTabContentArea:contentAreaRect];
 
   // Place the status bubble at the bottom of the content area.
   verticalOffsetForStatusBubble_ = minY;
 
   // Normally, we don't need to tell the toolbar whether or not to show the
   // divider, but things break down during animation.
   [toolbarController_
       setDividerOpacity:[bookmarkBarController_ toolbarDividerOpacity]];
 }
 
@@ skipping 83 matching lines @@
 
 - (BOOL)placeBookmarkBarBelowInfoBar {
   // If we are currently displaying the NTP detached bookmark bar or animating
   // to/from it (from/to anything else), we display the bookmark bar below the
   // infobar.
   return [bookmarkBarController_ isInState:bookmarks::kDetachedState] ||
       [bookmarkBarController_ isAnimatingToState:bookmarks::kDetachedState] ||
       [bookmarkBarController_ isAnimatingFromState:bookmarks::kDetachedState];
 }
 
-- (CGFloat)layoutBookmarkBarAtMaxY:(CGFloat)maxY width:(CGFloat)width {
+- (CGFloat)layoutBookmarkBarAtMinX:(CGFloat)minX
+                              maxY:(CGFloat)maxY
+                             width:(CGFloat)width {
   NSView* bookmarkBarView = [bookmarkBarController_ view];
   NSRect bookmarkBarFrame = [bookmarkBarView frame];
   BOOL oldHidden = [bookmarkBarView isHidden];
   BOOL newHidden = ![self isBookmarkBarVisible];
   if (oldHidden != newHidden)
     [bookmarkBarView setHidden:newHidden];
+  bookmarkBarFrame.origin.x = minX;
   bookmarkBarFrame.origin.y = maxY - NSHeight(bookmarkBarFrame);
   bookmarkBarFrame.size.width = width;
   [bookmarkBarView setFrame:bookmarkBarFrame];
   maxY -= NSHeight(bookmarkBarFrame);
 
   // TODO(viettrungluu): Does this really belong here? Calling it shouldn't be
   // necessary in the non-NTP case.
   [bookmarkBarController_ layoutSubviews];
 
   return maxY;
 }
 
-- (void)layoutFloatingBarBackingViewAtY:(CGFloat)y
-                                  width:(CGFloat)width
-                                 height:(CGFloat)height
-                             fullscreen:(BOOL)fullscreen {
+- (void)layoutFloatingBarBackingView:(NSRect)frame
+                          fullscreen:(BOOL)fullscreen {
   // Only display when in fullscreen mode.
   if (fullscreen) {
     // For certain window types such as app windows (e.g., the dev tools
     // window), there's no actual overlay. (Displaying one would result in an
     // overly sliding in only under the menu, which gives an ugly effect.)
-    NSRect frame = NSMakeRect(0, y, width, height);
     if (floatingBarBackingView_.get()) {
       BOOL aboveBookmarkBar = [self placeBookmarkBarBelowInfoBar];
 
       // Insert it into the view hierarchy if necessary.
       if (![floatingBarBackingView_ superview] ||
           aboveBookmarkBar != floatingBarAboveBookmarkBar_) {
         NSView* contentView = [[self window] contentView];
         // z-order gets messed up unless we explicitly remove the floatingbar
         // view and re-add it.
         [floatingBarBackingView_ removeFromSuperview];
@@ skipping 10 matching lines @@
 
     // But we want the logic to work as usual (for show/hide/etc. purposes).
     [fullscreenController_ overlayFrameChanged:frame];
   } else {
     // Okay to call even if |floatingBarBackingView_| is nil.
     if ([floatingBarBackingView_ superview])
       [floatingBarBackingView_ removeFromSuperview];
   }
 }
 
-- (CGFloat)layoutInfoBarAtMaxY:(CGFloat)maxY width:(CGFloat)width {
+- (CGFloat)layoutInfoBarAtMinX:(CGFloat)minX
+                          maxY:(CGFloat)maxY
+                         width:(CGFloat)width {
   NSView* infoBarView = [infoBarContainerController_ view];
   NSRect infoBarFrame = [infoBarView frame];
+  infoBarFrame.origin.x = minX;
   infoBarFrame.origin.y = maxY - NSHeight(infoBarFrame);
   infoBarFrame.size.width = width;
   [infoBarView setFrame:infoBarFrame];
   maxY -= NSHeight(infoBarFrame);
   return maxY;
 }
 
-- (CGFloat)layoutDownloadShelfAtMinY:(CGFloat)minY width:(CGFloat)width {
+- (CGFloat)layoutDownloadShelfAtMinX:(CGFloat)minX
+                                minY:(CGFloat)minY
+                               width:(CGFloat)width {
   if (downloadShelfController_.get()) {
     NSView* downloadView = [downloadShelfController_ view];
     NSRect downloadFrame = [downloadView frame];
+    downloadFrame.origin.x = minX;
     downloadFrame.origin.y = minY;
     downloadFrame.size.width = width;
     [downloadView setFrame:downloadFrame];
     minY += NSHeight(downloadFrame);
   }
   return minY;
 }
 
-- (void)layoutTabContentAreaAtMinY:(CGFloat)minY
-                              maxY:(CGFloat)maxY
-                             width:(CGFloat)width {
+- (void)layoutTabContentArea:(NSRect)newFrame {
   NSView* tabContentView = [self tabContentArea];
   NSRect tabContentFrame = [tabContentView frame];
 
-  bool contentShifted = NSMaxY(tabContentFrame) != maxY;
+  bool contentShifted = NSMaxY(tabContentFrame) != NSMaxY(newFrame);

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

Do you know the difference between "==" and "NSEqualRects"?

 
-  tabContentFrame.origin.y = minY;
-  tabContentFrame.size.height = maxY - minY;
-  tabContentFrame.size.width = width;
+  tabContentFrame = newFrame;
   [tabContentView setFrame:tabContentFrame];
 
   // If the relayout shifts the content area up or down, let the renderer know.
   if (contentShifted) {
     if (TabContents* contents = browser_->GetSelectedTabContents()) {
       if (RenderWidgetHostView* rwhv = contents->GetRenderWidgetHostView())
         rwhv->WindowFrameChanged();
     }
   }
 }
@@ skipping 54 matching lines @@
 
 - (void)disableBarVisibilityUpdates {
   // Early escape if there's nothing to do.
   if (!barVisibilityUpdatesEnabled_)
     return;
 
   barVisibilityUpdatesEnabled_ = NO;
   [fullscreenController_ cancelAnimationAndTimers];
 }
 
+// Removes existing toolbar and re-creates the appropriate toolbar controller
+// based on if vertical tabs are enabled.
+- (void)initializeToolbarWithBrowser:(Browser*)browser {
+  // Remove existing view.
+  [[toolbarController_ view] removeFromSuperview];
+  toolbarController_.reset(nil);
+
+  // Create appropriate toolbar controller.
+  if ([self useVerticalTabs]) {
+    toolbarController_.reset([[SideTabsToolbarController alloc]
+                               initWithModel:browser->toolbar_model()
+                                    commands:browser->command_updater()
+                                     profile:browser->profile()
+                                     browser:browser
+                              resizeDelegate:self]);
+  } else {
+    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]];
+}
+
 @end  // @implementation BrowserWindowController(Private)