Instant Extended: Delete unused overlay code

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 "base/prefs/pref_service.h"
 #include "chrome/browser/browser_process.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"
 #include "content/public/browser/web_contents_view.h"
 
 using content::WebContents;
 
 @interface GraySplitView : NSSplitView {
-  CGFloat topContentOffset_;
   BOOL dividerHidden_;
 }
 
-@property(assign, nonatomic) CGFloat topContentOffset;
 @property(assign, nonatomic) BOOL dividerHidden;
 
 - (NSColor*)dividerColor;
 - (CGFloat)dividerThickness;
 
 @end
 
 
 @implementation GraySplitView
 
-@synthesize topContentOffset = topContentOffset_;
 @synthesize dividerHidden = dividerHidden_;
 
 - (NSColor*)dividerColor {
   return [NSColor darkGrayColor];
 }
 
 - (CGFloat)dividerThickness {
   return dividerHidden_ ? 0 : [super dividerThickness];
 }
 
-- (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
 
 @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 47 matching lines @@
     [self hideDevToolsContainer];
 
   devToolsWindow_ = newDevToolsWindow;
 
   if (devToolsWindow_) {
     dockSide_ = devToolsWindow_->dock_side();
     [self showDevToolsContainer];
   }
 }
 
-- (CGFloat)topContentOffset {
-  return [splitView_ topContentOffset];
-}
-
-- (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->GetView()->GetNativeView();
   view_id_util::SetID(devToolsView, VIEW_ID_DEV_TOOLS_DOCKED);
-  [devToolsView setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];

[Robert Sesek, 2013/06/27 13:29:48]

Did you mean to remove the autoresizing mask?

[sail, 2013/06/27 18:26:03]

Yea. I added the resizing mask when I put devToolsView inside a container view.
Normally the split view auto resizes the view to fit the pane.

-
-  NSRect containerRect = NSMakeRect(0, 0, 100, 100);
-  base::scoped_nsobject<NSView> devToolsContainerView(
-      [[NSView alloc] initWithFrame:containerRect]);
-  [devToolsContainerView addSubview:devToolsView];
-  [splitView_ addSubview:devToolsContainerView];
+  [splitView_ addSubview:devToolsView];
 
   BOOL isVertical = devToolsWindow_->dock_side() == DEVTOOLS_DOCK_SIDE_RIGHT;
   [splitView_ setVertical:isVertical];
   [self updateDevToolsSplitPosition];
-  [self updateDevToolsViewFrame];
 }
 
 - (void)hideDevToolsContainer {
   NSArray* subviews = [splitView_ subviews];
   DCHECK_EQ([subviews count], 2u);
   NSView* oldDevToolsContentsView = [subviews objectAtIndex:1];
   [oldDevToolsContentsView removeFromSuperview];
   [splitView_ adjustSubviews];
 }
 
@@ skipping 27 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()->GetView()->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;
-}
-
 - (NSRect)splitView:(NSSplitView*)splitView
       effectiveRect:(NSRect)proposedEffectiveRect
        forDrawnRect:(NSRect)drawnRect
    ofDividerAtIndex:(NSInteger)dividerIndex {
   if (devToolsWindow_->dock_side() == DEVTOOLS_DOCK_SIDE_MINIMIZED) {
     return NSZeroRect;
   } else {
     return proposedEffectiveRect;
   }
 }
 
 - (CGFloat)splitView:(NSSplitView*)splitView
     constrainMaxCoordinate:(CGFloat)proposedMax
                ofSubviewAt:(NSInteger)dividerIndex {
   if ([splitView_ isVertical]) {
     return NSWidth([splitView_ frame]) - [splitView_ dividerThickness] -
         devToolsWindow_->GetMinimumWidth();
   } else {
     return NSHeight([splitView_ frame]) - [splitView_ dividerThickness] -
         devToolsWindow_->GetMinimumHeight();
   }
 }
 
 -(void)splitViewWillResizeSubviews:(NSNotification *)notification {
   [[splitView_ window] disableScreenUpdatesUntilFlush];
 }
 
 @end