Change grow box computation back to a method on BrowserWindow

chrome/browser/ui/cocoa/dev_tools_controller.mm

 // Copyright (c) 2011 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 15 matching lines @@
 const int kMinDevToolsHeight = 50;
 const int kMinDevToolsWidth = 150;
 const int kMinContentsSize = 50;
 
 }  // end namespace
 
 
 @interface DevToolsController (Private)
 - (void)showDevToolsContents:(WebContents*)devToolsContents
                  withProfile:(Profile*)profile;
-- (void)showDevToolsContainer:(Profile*)profile;
+- (void)showDevToolsContainer:(NSView*)container profile:(Profile*)profile;
 - (void)hideDevToolsContainer:(Profile*)profile;
 - (void)resizeDevTools:(CGFloat)size;
 @end
 
 
 @implementation DevToolsController
 
-- (id)initWithDelegate:(id<TabContentsControllerDelegate>)delegate {
+- (id)init {
   if ((self = [super init])) {
     splitView_.reset([[NSSplitView alloc] initWithFrame:NSZeroRect]);
     [splitView_ setDividerStyle:NSSplitViewDividerStyleThin];
     [splitView_ setVertical:NO];
     [splitView_ setAutoresizingMask:NSViewWidthSizable|NSViewHeightSizable];
-    [splitView_ setDelegate:self];
 
     dockToRight_ = NO;
-
-    contentsController_.reset(
-        [[TabContentsController alloc] initWithContents:NULL
-                                               delegate:delegate]);
   }
   return self;
 }
 
-- (void)dealloc {
-  [splitView_ setDelegate:nil];
-  [super dealloc];
-}
-
 - (NSView*)view {
   return splitView_.get();
 }
 
 - (NSSplitView*)splitView {
   return splitView_.get();
 }
 
 - (void)updateDevToolsForWebContents:(WebContents*)contents
                          withProfile:(Profile*)profile {
   // Get current devtools content.
   TabContentsWrapper* devToolsTab = contents ?
       DevToolsWindow::GetDevToolsContents(contents) : NULL;
   WebContents* devToolsContents = devToolsTab ?
       devToolsTab->web_contents() : NULL;
 
   [self showDevToolsContents:devToolsContents withProfile:profile];
 }
 
 - (void)setDockToRight:(BOOL)dockToRight
            withProfile:(Profile*)profile {
   if (dockToRight_ == dockToRight)
     return;
 
   NSArray* subviews = [splitView_ subviews];
   if ([subviews count] == 2) {
+    scoped_nsobject<NSView> devToolsContentsView(
+        [[subviews objectAtIndex:1] retain]);
     [self hideDevToolsContainer:profile];
     dockToRight_ = dockToRight;
-    [self showDevToolsContainer:profile];
+    [self showDevToolsContainer:devToolsContentsView profile:profile];
   } else {
     dockToRight_ = dockToRight;
   }
 }
 
-- (void)ensureContentsVisible {
-  [contentsController_ ensureContentsVisible];
-}
-
 - (void)showDevToolsContents:(WebContents*)devToolsContents
                  withProfile:(Profile*)profile {
-  [contentsController_ ensureContentsSizeDoesNotChange];
-
   NSArray* subviews = [splitView_ subviews];
   if (devToolsContents) {
     // |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.
-    view_id_util::SetID(devToolsContents->GetNativeView(),
-                        VIEW_ID_DEV_TOOLS_DOCKED);
-    [self showDevToolsContainer:profile];
+    NSView* devToolsView = devToolsContents->GetNativeView();
+    view_id_util::SetID(devToolsView, VIEW_ID_DEV_TOOLS_DOCKED);
+    [self showDevToolsContainer:devToolsView profile:profile];
   } else {
     if ([subviews count] > 1) {
       [self hideDevToolsContainer:profile];
     }
   }
-
-  [contentsController_ changeWebContents:devToolsContents];
 }
 
-- (void)showDevToolsContainer:(Profile*)profile {
+- (void)showDevToolsContainer:(NSView*)container profile:(Profile*)profile {
   NSArray* subviews = [splitView_ subviews];
   DCHECK_GE([subviews count], 1u);
 
   CGFloat splitOffset = 0;
 
   CGFloat contentSize =
       dockToRight_ ? NSWidth([splitView_ frame])
                    : NSHeight([splitView_ frame]);
 
   if ([subviews count] == 1) {
     // Load the default split offset.
     splitOffset = profile->GetPrefs()->
         GetInteger(prefs::kDevToolsSplitLocation);
 
     if (splitOffset < 0)
       splitOffset = contentSize * 1 / 3;
 
-    [splitView_ addSubview:[contentsController_ view]];
+    [splitView_ addSubview:container];
   } else {
     DCHECK_EQ([subviews count], 2u);
     // If devtools are already visible, keep the current size.
     splitOffset = dockToRight_ ? NSWidth([[subviews objectAtIndex:1] frame])
                                : NSHeight([[subviews objectAtIndex:1] frame]);
   }
 
   // Make sure |splitOffset| isn't too large or too small.
   CGFloat minSize = dockToRight_ ? kMinDevToolsWidth: kMinDevToolsHeight;
   splitOffset = std::max(minSize, splitOffset);
@@ skipping 61 matching lines @@
   // 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;
 }
 
 @end