Alternate NTP: Resize devtools when hiding bookmark bar

chrome/browser/ui/cocoa/dev_tools_controller.mm

 // Copyright (c) 2012 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/ui/cocoa/dev_tools_controller.h"
 
 #include <algorithm>
 
 #include <Cocoa/Cocoa.h>
 
@@ skipping 41 matching lines @@
     return nil;
   return [super hitTest:point];
 }
 
 @end
 
 @interface DevToolsController (Private)
 - (void)showDevToolsContainer;
 - (void)hideDevToolsContainer;
 - (void)updateDevToolsSplitPosition;
+- (void)updateDevToolsViewFrame;
 @end
 
 
 @implementation DevToolsController
 
 - (id)init {
   if ((self = [super init])) {
     splitView_.reset([[GraySplitView alloc] initWithFrame:NSZeroRect]);
     [splitView_ setDividerStyle:NSSplitViewDividerStyleThin];
     [splitView_ setVertical:NO];
@@ skipping 50 matching lines @@
   devToolsWindow_ = newDevToolsWindow;
 
   if (devToolsWindow_) {
     dockSide_ = devToolsWindow_->dock_side();
     [self showDevToolsContainer];
   }
 }
 
 - (void)setTopContentOffset:(CGFloat)offset {
   [splitView_ setTopContentOffset:offset];
+  if ([[splitView_ subviews] count] > 1)
+    [self updateDevToolsViewFrame];
 }
 
 - (void)showDevToolsContainer {
   NSArray* subviews = [splitView_ subviews];
   DCHECK_EQ([subviews count], 1u);
   WebContents* devToolsContents = devToolsWindow_->web_contents();
 
   // |devToolsView| is a TabContentsViewCocoa object, whose ViewID was
   // set to VIEW_ID_TAB_CONTAINER initially, so we need to change it to
   // VIEW_ID_DEV_TOOLS_DOCKED here.
   NSView* devToolsView = devToolsContents->GetNativeView();
   view_id_util::SetID(devToolsView, VIEW_ID_DEV_TOOLS_DOCKED);
+  [devToolsView setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
 
   NSRect containerRect = NSMakeRect(0, 0, 100, 100);
   scoped_nsobject<NSView> devToolsContainerView(
       [[NSView alloc] initWithFrame:containerRect]);
-
-  NSRect devToolsRect = containerRect;
-  if (devToolsWindow_->dock_side() == DEVTOOLS_DOCK_SIDE_RIGHT) {
-    devToolsRect.size.height -= [splitView_ topContentOffset];
-  }
-  [devToolsView setFrame:devToolsRect];
-  [devToolsView setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
-
   [devToolsContainerView addSubview:devToolsView];
   [splitView_ addSubview:devToolsContainerView];
+  [self updateDevToolsViewFrame];
 
   BOOL isVertical = devToolsWindow_->dock_side() == DEVTOOLS_DOCK_SIDE_RIGHT;
   [splitView_ setVertical:isVertical];
   [self updateDevToolsSplitPosition];
 }
 
 - (void)hideDevToolsContainer {
   NSArray* subviews = [splitView_ subviews];
   DCHECK_EQ([subviews count], 2u);
   NSView* oldDevToolsContentsView = [subviews objectAtIndex:1];
@@ skipping 25 matching lines @@
         NSHeight([splitView_ frame]) - ([splitView_ dividerThickness] + size);
   }
 
   [[splitView_ window] disableScreenUpdatesUntilFlush];
   [webView setFrame:webFrame];
   [devToolsView setFrame:devToolsFrame];
 
   [splitView_ adjustSubviews];
 }
 
+- (void)updateDevToolsViewFrame {
+  NSView* devToolsView = devToolsWindow_->web_contents()->GetNativeView();
+  NSRect devToolsRect = [[devToolsView superview] bounds];
+  if (devToolsWindow_->dock_side() == DEVTOOLS_DOCK_SIDE_RIGHT)
+    devToolsRect.size.height -= [splitView_ topContentOffset];
+  [devToolsView setFrame:devToolsRect];
+}
+
 // NSSplitViewDelegate protocol.
 - (BOOL)splitView:(NSSplitView *)splitView
     shouldAdjustSizeOfSubview:(NSView *)subview {
   // Return NO for the devTools view to indicate that it should not be resized
   // automatically. It preserves the height set by the user and also keeps
   // view height the same while changing tabs when one of the tabs shows infobar
   // and others are not.
   if ([[splitView_ subviews] indexOfObject:subview] == 1)
     return NO;
   return YES;
 }
 
 - (CGFloat)splitView:(NSSplitView*)splitView
     constrainSplitPosition:(CGFloat)proposedPosition
                ofSubviewAt:(NSInteger)dividerIndex {
   if (![splitView_ isVertical] &&
       proposedPosition < [splitView_ topContentOffset]) {
     return [splitView_ topContentOffset];
   }
   return proposedPosition;
 }
 
 -(void)splitViewWillResizeSubviews:(NSNotification *)notification {
   [[splitView_ window] disableScreenUpdatesUntilFlush];
 }
 
 @end