Handle resize corner layout entirely in the platform BrowserWindow*/BrowserView* code...

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.h"
 #include "app/l10n_util_mac.h"
@@ skipping 222 matching lines @@
     // windows may get resized later on in this function, once the actual size
     // of the toolbar/tabstrip is known.
     windowShim_->SetBounds(windowRect);
 
     // Puts the incognito badge on the window frame, if necessary.
     [self installIncognitoBadge];
 
     // Create a sub-controller for the docked devTools and add its view to the
     // hierarchy.  This must happen before the sidebar controller is
     // instantiated.
-    devToolsController_.reset([[DevToolsController alloc] init]);
+    devToolsController_.reset(
+        [[DevToolsController alloc] initWithDelegate:self]);
     [[devToolsController_ view] setFrame:[[self tabContentArea] bounds]];
     [[self tabContentArea] addSubview:[devToolsController_ view]];
 
     // Create a sub-controller for the docked sidebar and add its view to the
     // hierarchy.  This must happen before the previewable contents controller
     // is instantiated.
-    sidebarController_.reset([[SidebarController alloc] init]);
+    sidebarController_.reset([[SidebarController alloc] initWithDelegate:self]);
     [[sidebarController_ view] setFrame:[[devToolsController_ view] bounds]];
     [[devToolsController_ view] addSubview:[sidebarController_ view]];
 
     // Create the previewable contents controller.  This provides the switch
     // view that TabStripController needs.
     previewableContentsController_.reset(
         [[PreviewableContentsController alloc] init]);
     [[previewableContentsController_ view]
         setFrame:[[sidebarController_ view] bounds]];
     [[sidebarController_ view]
@@ skipping 176 matching lines @@
 - (void)attachConstrainedWindow:(ConstrainedWindowMac*)window {
   [tabStripController_ attachConstrainedWindow:window];
 }
 
 - (void)removeConstrainedWindow:(ConstrainedWindowMac*)window {
   [tabStripController_ removeConstrainedWindow:window];
 }
 
 - (void)updateDevToolsForContents:(TabContents*)contents {
   [devToolsController_ updateDevToolsForTabContents:contents];
+  [devToolsController_ ensureContentsVisible];
 }
 
 - (void)updateSidebarForContents:(TabContents*)contents {
   [sidebarController_ updateSidebarForTabContents:contents];
+  [sidebarController_ ensureContentsVisible];
 }
 
 // Called when the user wants to close a window or from the shutdown process.
 // The Browser object is in control of whether or not we're allowed to close. It
 // may defer closing due to several states, such as onUnload handlers needing to
 // be fired. If closing is deferred, the Browser will handle the processing
 // required to get us to the closing state and (by watching for all the tabs
 // going away) will again call to close the window when it's finally ready.
 - (BOOL)windowShouldClose:(id)sender {
   // Disable updates while closing all tabs to avoid flickering.
@@ skipping 577 matching lines @@
 - (void)updateToolbarWithContents:(TabContents*)tab
                shouldRestoreState:(BOOL)shouldRestore {
   [toolbarController_ updateToolbarWithContents:tab
                              shouldRestoreState:shouldRestore];
 }
 
 - (void)setStarredState:(BOOL)isStarred {
   [toolbarController_ setStarredState:isStarred];
 }
 
-// Return the rect, in WebKit coordinates (flipped), of the window's grow box
-// in the coordinate system of the content area of the currently selected tab.
-// |windowGrowBox| needs to be in the window's coordinate system.
-- (NSRect)selectedTabGrowBoxRect {
-  NSWindow* window = [self window];
-  if (![window respondsToSelector:@selector(_growBoxRect)])
-    return NSZeroRect;
-
-  // Before we return a rect, we need to convert it from window coordinates
-  // to tab content area coordinates and flip the coordinate system.
-  NSRect growBoxRect =
-      [[self tabContentArea] convertRect:[window _growBoxRect] fromView:nil];
-  growBoxRect.origin.y =
-      [[self tabContentArea] frame].size.height - growBoxRect.size.height -
-      growBoxRect.origin.y;
-  return growBoxRect;
-}
-
 // Accept tabs from a BrowserWindowController with the same Profile.
 - (BOOL)canReceiveFrom:(TabWindowController*)source {
   if (![source isKindOfClass:[BrowserWindowController class]]) {
     return NO;
   }
 
   BrowserWindowController* realSource =
       static_cast<BrowserWindowController*>(source);
   if (browser_->profile() != realSource->browser_->profile()) {
     return NO;
@@ skipping 269 matching lines @@
 - (NSRect)regularWindowFrame {
   return [self isFullscreen] ? [savedRegularWindow_ frame] :
                                [[self window] frame];
 }
 
 // (Override of |TabWindowController| method.)
 - (BOOL)hasTabStrip {
   return [self supportsWindowFeature:Browser::FEATURE_TABSTRIP];
 }
 
+// TabContentsControllerDelegate protocol.
+- (void)tabContentsViewFrameWillChange:(TabContentsController*)source
+                             frameRect:(NSRect)frameRect {
+  TabContents* contents = [source tabContents];
+  RenderWidgetHostView* render_widget_host_view = contents ?
+      contents->GetRenderWidgetHostView() : NULL;
+  if (!render_widget_host_view)
+    return;
+
+  gfx::Rect reserved_rect;
+
+  NSWindow* window = [self window];
+  if ([window respondsToSelector:@selector(_growBoxRect)]) {
+    NSView* view = [source view];
+    NSRect windowGrowBoxRect = [window _growBoxRect];
+    NSRect viewRect = [[view superview] convertRect:frameRect toView:nil];
+    NSRect growBoxRect = NSIntersectionRect(windowGrowBoxRect, viewRect);
+    if (!NSIsEmptyRect(growBoxRect)) {
+      // Before we return a rect, we need to convert it from window coordinates
+      // to content area coordinates and flip the coordinate system.
+      // Superview is used here because, first, it's a frame rect, so it is
+      // specified in the parent's coordinates and, second, view is not
+      // positioned yet.
+      growBoxRect = [[view superview] convertRect:growBoxRect fromView:nil];
+      growBoxRect.origin.y =
+          NSHeight(frameRect) - NSHeight(growBoxRect);
+      growBoxRect =
+          NSOffsetRect(growBoxRect, -frameRect.origin.x, -frameRect.origin.y);
+
+      reserved_rect =
+          gfx::Rect(growBoxRect.origin.x, growBoxRect.origin.y,
+                    growBoxRect.size.width, growBoxRect.size.height);
+    }
+  }
+
+  render_widget_host_view->set_reserved_contents_rect(reserved_rect);
+}
+
 // TabStripControllerDelegate protocol.
 - (void)onSelectTabWithContents:(TabContents*)contents {
   // Update various elements that are interested in knowing the current
   // TabContents.
 
   // Update all the UI bits.
   windowShim_->UpdateTitleBar();
 
-  [self updateSidebarForContents:contents];
-  [self updateDevToolsForContents:contents];
+  [sidebarController_ updateSidebarForTabContents:contents];
+  [devToolsController_ updateDevToolsForTabContents:contents];
 
   // Update the bookmark bar.
   // Must do it after sidebar and devtools update, otherwise bookmark bar might
   // call resizeView -> layoutSubviews and cause unnecessary relayout.
   // TODO(viettrungluu): perhaps update to not terminate running animations (if
   // applicable)?
   [self updateBookmarkBarVisibilityWithAnimation:NO];
 
   [infoBarContainerController_ changeTabContents:contents];
+
+  // Update devTools and sidebar contents after size for all views is set.
+  [sidebarController_ ensureContentsVisible];
+  [devToolsController_ ensureContentsVisible];
 }
 
 - (void)onReplaceTabWithContents:(TabContents*)contents {
   // This is only called when instant results are committed.  Simply remove the
   // preview view; the tab strip controller will reinstall the view as the
   // active view.
   [previewableContentsController_ hidePreview];
   [self updateBookmarkBarVisibilityWithAnimation:NO];
 }
 
@@ skipping 631 matching lines @@
 
 - (BOOL)supportsBookmarkBar {
   return [self supportsWindowFeature:Browser::FEATURE_BOOKMARKBAR];
 }
 
 - (BOOL)isNormalWindow {
   return browser_->type() == Browser::TYPE_NORMAL;
 }
 
 @end  // @implementation BrowserWindowController(WindowType)