Alternate NTP: Don't overlap dev tools with 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>
 
+#import "base/mac/foundation_util.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #import "chrome/browser/ui/cocoa/view_id_util.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/web_contents.h"
 
 using content::WebContents;
 
 @interface GraySplitView : NSSplitView {
   CGFloat topContentOffset_;
 }
 
 @property(assign, nonatomic) CGFloat topContentOffset;
 
 - (NSColor*)dividerColor;
 
 @end
 
 
 @implementation GraySplitView
 
 @synthesize topContentOffset = topContentOffset_;
 
 - (NSColor*)dividerColor {
   return [NSColor darkGrayColor];
 }
 
+- (void)drawDividerInRect:(NSRect)aRect {
+  NSRect dividerRect = aRect;
+  if ([self isVertical]) {
+    dividerRect.size.height -= topContentOffset_;
+    dividerRect.origin.y += topContentOffset_;
+  }
+  [super drawDividerInRect:dividerRect];
+}
+
 - (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
 
@@ skipping 67 matching lines @@
 - (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);
-  [splitView_ addSubview:devToolsView];
+
+  scoped_nsobject<DevToolsContainerView> devToolsContainerView(
+      [[DevToolsContainerView alloc] initWithFrame:[devToolsView bounds]]);
+  [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];
   DCHECK_EQ([subviews count], 2u);
   NSView* oldDevToolsContentsView = [subviews objectAtIndex:1];
@@ skipping 37 matching lines @@
     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