Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / cocoa / dev_tools_controller.mm

diff --git a/src/chrome/browser/ui/cocoa/dev_tools_controller.mm b/src/chrome/browser/ui/cocoa/dev_tools_controller.mm
index 9ce1940..8236fd7 100644 (file)
--- a/src/chrome/browser/ui/cocoa/dev_tools_controller.mm
+++ b/src/chrome/browser/ui/cocoa/dev_tools_controller.mm
@@ -30,40 +30,51 @@ using content::WebContents;
   NSView* contentsView_;
 }
 
-- (void)setContentsResizingStrategy:
-    (const DevToolsContentsResizingStrategy&)strategy;
+- (void)setDevToolsView:(NSView*)devToolsView
+           withStrategy:(const DevToolsContentsResizingStrategy&)strategy;
 - (void)adjustSubviews;
-- (void)showDevTools:(NSView*)devToolsView;
-- (void)hideDevTools;
+- (BOOL)hasDevToolsView;
 
 @end
 
 
 @implementation DevToolsContainerView
 
-- (void)setContentsResizingStrategy:
-    (const DevToolsContentsResizingStrategy&)strategy {
+- (void)setDevToolsView:(NSView*)devToolsView
+           withStrategy:(const DevToolsContentsResizingStrategy&)strategy {
   strategy_.CopyFrom(strategy);
+  if (devToolsView == devToolsView_) {
+    if (contentsView_)
+      [contentsView_ setHidden:strategy.hide_inspected_contents()];
+    return;
+  }
+
+  if (devToolsView_) {
+    DCHECK_EQ(2u, [[self subviews] count]);
+    [devToolsView_ removeFromSuperview];
+    [contentsView_ setHidden:NO];
+    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];
+
+    [contentsView_ setHidden:strategy.hide_inspected_contents()];
+  }
 }
 
 - (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 {
@@ -83,8 +94,6 @@ using content::WebContents;
   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]];
@@ -92,11 +101,6 @@ using content::WebContents;
 
 @end
 
-@interface DevToolsController (Private)
-- (void)showDevToolsView;
-- (void)hideDevToolsView;
-@end
-
 
 @implementation DevToolsController
 
@@ -122,47 +126,33 @@ using content::WebContents;
 
   // 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 (shouldShow)
-    [self showDevToolsView];
 
-  [devToolsContainerView_ adjustSubviews];
-}
+  if (devTools && ![devToolsContainerView_ hasDevToolsView]) {
+    focusTracker_.reset(
+        [[FocusTracker alloc] initWithWindow:[devToolsContainerView_ window]]);
+  }
 
-- (void)showDevToolsView {
-  focusTracker_.reset(
-      [[FocusTracker alloc] initWithWindow:[devToolsContainerView_ window]]);
+  if (!devTools && [devToolsContainerView_ hasDevToolsView]) {
+    [focusTracker_ restoreFocusInWindow:[devToolsContainerView_ window]];
+    focusTracker_.reset();
+  }
 
-  // |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);
+  NSView* devToolsView = nil;
+  if (devTools) {
+    devToolsView = devTools->GetNativeView();
+    // |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);
 
-  [devToolsContainerView_ showDevTools:devToolsView];
-}
+    devTools->SetAllowOtherViews(true);
+    contents->SetAllowOtherViews(true);
+  } else {
+    contents->SetAllowOtherViews(false);
+  }
 
-- (void)hideDevToolsView {
-  devTools_->RemoveOverlayView();
-  [devToolsContainerView_ hideDevTools];
-  [focusTracker_ restoreFocusInWindow:[devToolsContainerView_ window]];
-  focusTracker_.reset();
+  [devToolsContainerView_ setDevToolsView:devToolsView withStrategy:strategy];
+  [devToolsContainerView_ adjustSubviews];
 }
 
 @end