Alternate NTP: Fix dev tools layout

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 37 matching lines @@
 
 - (NSView*)hitTest:(NSPoint)point {
   NSPoint viewPoint = [self convertPoint:point fromView:[self superview]];
   if (viewPoint.y < topContentOffset_)
     return nil;
   return [super hitTest:point];
 }
 
 @end
 
-// Superview for the dev tools contents view. This class ensures that dev tools
-// view doesn't overlap the toolbar when split vertically.
-@interface DevToolsContainerView : NSView
-@end
-
-@implementation DevToolsContainerView
-
-- (void)resizeSubviewsWithOldSize:(NSSize)oldBoundsSize {
-  NSRect subviewFrame = [self bounds];
-  GraySplitView* splitView =
-      base::mac::ObjCCastStrict<GraySplitView>([self superview]);
-  if ([splitView isVertical])
-    subviewFrame.size.height -= [splitView topContentOffset];
-
-  DCHECK_EQ(1u, [[self subviews] count]);
-  [[[self subviews] lastObject] setFrame:subviewFrame];
-}
-
-@end
-
-
 @interface DevToolsController (Private)
 - (void)showDevToolsContainer;
 - (void)hideDevToolsContainer;
 - (void)updateDevToolsSplitPosition;
 @end
 
 
 @implementation DevToolsController
 
 - (id)init {
@@ skipping 67 matching lines @@
   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);
 
-  scoped_nsobject<DevToolsContainerView> devToolsContainerView(
-      [[DevToolsContainerView alloc] initWithFrame:[devToolsView bounds]]);
+  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];
 
   BOOL isVertical = devToolsWindow_->dock_side() == DEVTOOLS_DOCK_SIDE_RIGHT;
   [splitView_ setVertical:isVertical];
   [self updateDevToolsSplitPosition];
 }
 
 - (void)hideDevToolsContainer {
   NSArray* subviews = [splitView_ subviews];
@@ skipping 54 matching lines @@
     return [splitView_ topContentOffset];
   }
   return proposedPosition;
 }
 
 -(void)splitViewWillResizeSubviews:(NSNotification *)notification {
   [[splitView_ window] disableScreenUpdatesUntilFlush];
 }
 
 @end