[DevTools] Use special resizing strategy instead of insets.

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 <cmath>
 
 #include <Cocoa/Cocoa.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"
+#include "ui/base/cocoa/base_view.h"
 #include "ui/base/cocoa/focus_tracker.h"
 #include "ui/gfx/size_conversions.h"
 
 using content::WebContents;
 
-@interface DevToolsContainerView : NSView {
-  gfx::Insets contentsInsets_;
+@interface DevToolsContainerView : BaseView {
+  DevToolsContentsResizingStrategy strategy_;
 
   // Weak references. Ownership via -subviews.
   NSView* devToolsView_;
   NSView* contentsView_;
 }
 
-- (void)setContentsInsets:(const gfx::Insets&)insets;
+- (void)setContentsResizingStrategy:
+    (const DevToolsContentsResizingStrategy&)strategy;
 - (void)adjustSubviews;
 - (void)showDevTools:(NSView*)devToolsView;
 - (void)hideDevTools;
 
 @end
 
 
 @implementation DevToolsContainerView
 
-- (void)setContentsInsets:(const gfx::Insets&)insets {
-  contentsInsets_ = insets;
+- (void)setContentsResizingStrategy:
+    (const DevToolsContentsResizingStrategy&)strategy {
+  strategy_.CopyFrom(strategy);
 }
 
 - (void)resizeSubviewsWithOldSize:(NSSize)oldBoundsSize {
   [self adjustSubviews];
 }
 
 - (void)showDevTools:(NSView*)devToolsView {
   NSArray* subviews = [self subviews];
   DCHECK_EQ(1u, [subviews count]);
   contentsView_ = [subviews objectAtIndex:0];
@@ skipping 14 matching lines @@
     return;
 
   if (!devToolsView_) {
     DCHECK_EQ(1u, [[self subviews] count]);
     NSView* contents = [[self subviews] objectAtIndex:0];
     [contents setFrame:[self bounds]];
     return;
   }
 
   DCHECK_EQ(2u, [[self subviews] count]);
-  NSRect bounds = [self bounds];
-
-  [devToolsView_ setFrame:bounds];
-
-  CGFloat width = std::max(static_cast<CGFloat>(0),
-                           NSWidth(bounds) - contentsInsets_.width());
-  CGFloat height = std::max(static_cast<CGFloat>(0),
-                            NSHeight(bounds) - contentsInsets_.height());
-  CGFloat left = std::min(static_cast<CGFloat>(contentsInsets_.left()),
-                          NSWidth(bounds));
-  // Flip top and bottom for NSView geometry.
-  CGFloat top = std::min(static_cast<CGFloat>(contentsInsets_.bottom()),
-                         NSHeight(bounds));
-  [contentsView_ setFrame:NSMakeRect(left, top, width, height)];
+  gfx::Rect new_devtools_bounds;
+  gfx::Rect new_contents_bounds;
+  ApplyDevToolsContentsResizingStrategy(
+      strategy_, gfx::Size(NSSizeToCGSize([self bounds].size)),
+      [self flipNSRectToRect:[devToolsView_ bounds]],
+      [self flipNSRectToRect:[contentsView_ bounds]],
+      &new_devtools_bounds, &new_contents_bounds);
+  [devToolsView_ setFrame:[self flipRectToNSRect:new_devtools_bounds]];
+  [contentsView_ setFrame:[self flipRectToNSRect:new_contents_bounds]];
 }
 
 @end
 
 @interface DevToolsController (Private)
 - (void)showDevToolsView;
 - (void)hideDevToolsView;
 @end
 
 
@@ skipping 19 matching lines @@
       DevToolsWindow::GetDockedInstanceForInspectedTab(contents) : NULL;
 
   bool shouldHide = devToolsWindow_ && devToolsWindow_ != newDevToolsWindow;
   bool shouldShow = newDevToolsWindow && devToolsWindow_ != newDevToolsWindow;
 
   if (shouldHide)
     [self hideDevToolsView];
 
   devToolsWindow_ = newDevToolsWindow;
   if (devToolsWindow_) {
-    gfx::Insets insets = devToolsWindow_->GetContentsInsets();
+    const DevToolsContentsResizingStrategy& strategy =
+        devToolsWindow_->GetContentsResizingStrategy();
     devToolsWindow_->web_contents()->GetView()->SetOverlayView(
-        contents->GetView(), gfx::Point(insets.left(), insets.top()));
-    [devToolsContainerView_ setContentsInsets:insets];
+        contents->GetView(),
+        gfx::Point(strategy.insets().left(), strategy.insets().top()));
+    [devToolsContainerView_ setContentsResizingStrategy:strategy];
   } else {
-    gfx::Insets zeroInsets;
-    [devToolsContainerView_ setContentsInsets:zeroInsets];
+    DevToolsContentsResizingStrategy zeroStrategy;
+    [devToolsContainerView_ setContentsResizingStrategy:zeroStrategy];
   }
 
   if (shouldShow)
     [self showDevToolsView];
 
   [devToolsContainerView_ adjustSubviews];
   if (shouldHide || shouldShow)
     [[devToolsContainerView_ window] disableScreenUpdatesUntilFlush];
 }
 
@@ skipping 12 matching lines @@
 }
 
 - (void)hideDevToolsView {
   devToolsWindow_->web_contents()->GetView()->RemoveOverlayView();
   [devToolsContainerView_ hideDevTools];
   [focusTracker_ restoreFocusInWindow:[devToolsContainerView_ window]];
   focusTracker_.reset();
 }
 
 @end