[Mac] Replace SetOverlayView with AllowOtherViews.

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>
@@ skipping 12 matching lines @@
 using content::WebContents;
 
 @interface DevToolsContainerView : BaseView {
   DevToolsContentsResizingStrategy strategy_;
 
   // Weak references. Ownership via -subviews.
   NSView* devToolsView_;
   NSView* contentsView_;
 }
 
-- (void)setContentsResizingStrategy:
+- (void)setDevToolsView:(NSView*)devToolsView withStrategy:
     (const DevToolsContentsResizingStrategy&)strategy;

[Alexei Svitkine (slow), 2014/07/15 14:02:19]

Nit: Wrap before "withStrategy:" and align the :'s.

[dgozman, 2014/07/15 14:38:41]

Done.

 - (void)adjustSubviews;
-- (void)showDevTools:(NSView*)devToolsView;
-- (void)hideDevTools;
+- (BOOL)hasDevToolsView;
 
 @end
 
 
 @implementation DevToolsContainerView
 
-- (void)setContentsResizingStrategy:
+- (void)setDevToolsView:(NSView*)devToolsView withStrategy:

[Alexei Svitkine (slow), 2014/07/15 14:02:19]

Nit: Ditto.

[dgozman, 2014/07/15 14:38:41]

Done.

     (const DevToolsContentsResizingStrategy&)strategy {
   strategy_.CopyFrom(strategy);
+
+  if (devToolsView == devToolsView_)
+    return;
+
+  if (devToolsView_) {
+    DCHECK_EQ(2u, [[self subviews] count]);
+    [devToolsView_ removeFromSuperview];
+    contentsView_ = nil;
+    devToolsView_ = nil;
+  }
+
+  if (devToolsView) {
+    NSArray* subviews = [self subviews];
+    DCHECK_EQ(1u, [subviews count]);
+    contentsView_ = [subviews objectAtIndex:0];
+    devToolsView_ = devToolsView;
+    // Place DevTools under contents.
+    [self addSubview:devToolsView positioned:NSWindowBelow relativeTo:nil];
+  }
 }
 
 - (void)resizeSubviewsWithOldSize:(NSSize)oldBoundsSize {
   [self adjustSubviews];
 }
 
-- (void)showDevTools:(NSView*)devToolsView {
-  NSArray* subviews = [self subviews];
-  DCHECK_EQ(1u, [subviews count]);
-  contentsView_ = [subviews objectAtIndex:0];
-  devToolsView_ = devToolsView;
-  // Place DevTools under contents.
-  [self addSubview:devToolsView positioned:NSWindowBelow relativeTo:nil];
-}
-
-- (void)hideDevTools {
-  DCHECK_EQ(2u, [[self subviews] count]);
-  [devToolsView_ removeFromSuperview];
-  contentsView_ = nil;
-  devToolsView_ = nil;
+- (BOOL)hasDevToolsView {
+  return devToolsView_ != nil;
 }
 
 - (void)adjustSubviews {
   if (![[self subviews] count])
     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]);
 
   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
-
 
 @implementation DevToolsController
 
 - (id)init {
   if ((self = [super init])) {
     devToolsContainerView_.reset(
         [[DevToolsContainerView alloc] initWithFrame:NSZeroRect]);
     [devToolsContainerView_
         setAutoresizingMask:NSViewWidthSizable|NSViewHeightSizable];
   }
   return self;
 }
 
 - (NSView*)view {
   return devToolsContainerView_.get();
 }
 
 - (void)updateDevToolsForWebContents:(WebContents*)contents
                          withProfile:(Profile*)profile {
   DevToolsContentsResizingStrategy strategy;
   WebContents* devTools = DevToolsWindow::GetInTabWebContents(
       contents, &strategy);
 
   // Make sure we do not draw any transient arrangements of views.
   gfx::ScopedNSDisableScreenUpdates disabler;
-  bool shouldHide = devTools_ && devTools_ != devTools;
-  bool shouldShow = devTools && devTools_ != devTools;
 
-  if (shouldHide)
-    [self hideDevToolsView];
-
-  devTools_ = devTools;
-  if (devTools_) {
-    devTools_->SetOverlayView(
-        contents,
-        gfx::Point(strategy.insets().left(), strategy.insets().top()));
-    [devToolsContainerView_ setContentsResizingStrategy:strategy];
-  } else {
-    DevToolsContentsResizingStrategy zeroStrategy;
-    [devToolsContainerView_ setContentsResizingStrategy:zeroStrategy];
+  if (devTools && ![devToolsContainerView_ hasDevToolsView]) {
+    focusTracker_.reset(
+        [[FocusTracker alloc] initWithWindow:[devToolsContainerView_ window]]);
   }
 
-  if (shouldShow)
-    [self showDevToolsView];
+  if (!devTools && [devToolsContainerView_ hasDevToolsView]) {
+    [focusTracker_ restoreFocusInWindow:[devToolsContainerView_ window]];
+    focusTracker_.reset();
+  }
 
+  NSView* devToolsView = devTools ? devTools->GetNativeView() : nil;

[Alexei Svitkine (slow), 2014/07/15 14:02:19]

Nit: Given that you have an "if (devTools)" right below, remove this conditional
and init this to nil here and put the other stmt inside the if.

[dgozman, 2014/07/15 14:38:41]

Done.

+  if (devTools) {
+    // |devToolsView| is a WebContentsViewCocoa 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(devToolsView, VIEW_ID_DEV_TOOLS_DOCKED);
+
+    devTools->SetAllowOtherViews(true);
+    contents->SetAllowOtherViews(true);
+  } else {
+    contents->SetAllowOtherViews(false);
+  }
+
+  [devToolsContainerView_ setDevToolsView: devToolsView withStrategy: strategy];

[Alexei Svitkine (slow), 2014/07/15 14:02:19]

Nit: Remove spaces after :'s.

[dgozman, 2014/07/15 14:38:41]

Done.

   [devToolsContainerView_ adjustSubviews];
 }
 
-- (void)showDevToolsView {
-  focusTracker_.reset(
-      [[FocusTracker alloc] initWithWindow:[devToolsContainerView_ window]]);
-
-  // |devToolsView| is a WebContentsViewCocoa 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 = devTools_->GetNativeView();
-  view_id_util::SetID(devToolsView, VIEW_ID_DEV_TOOLS_DOCKED);
-
-  [devToolsContainerView_ showDevTools:devToolsView];
-}
-
-- (void)hideDevToolsView {
-  devTools_->RemoveOverlayView();
-  [devToolsContainerView_ hideDevTools];
-  [focusTracker_ restoreFocusInWindow:[devToolsContainerView_ window]];
-  focusTracker_.reset();
-}
-
 @end