[DevTools] Add toolbox web contents to show in undocked mode.

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 98 matching lines @@
   }
   return self;
 }
 
 - (NSView*)view {
   return devToolsContainerView_.get();
 }
 
 - (void)updateDevToolsForWebContents:(WebContents*)contents
                          withProfile:(Profile*)profile {
-  DevToolsWindow* newDevToolsWindow = contents ?
-      DevToolsWindow::GetDockedInstanceForInspectedTab(contents) : NULL;
+  DevToolsContentsResizingStrategy strategy;
+  WebContents* devTools = DevToolsWindow::GetWebContentsToShowForInspectedTab(
+      contents, &strategy);
 
   // Make sure we do not draw any transient arrangements of views.
   gfx::ScopedNSDisableScreenUpdates disabler;
-  bool shouldHide = devToolsWindow_ && devToolsWindow_ != newDevToolsWindow;
-  bool shouldShow = newDevToolsWindow && devToolsWindow_ != newDevToolsWindow;
+  bool shouldHide = devTools_ && devTools_ != devTools;
+  bool shouldShow = devTools && devTools_ != devTools;
 
   if (shouldHide)
     [self hideDevToolsView];
 
-  devToolsWindow_ = newDevToolsWindow;
-  if (devToolsWindow_) {
-    const DevToolsContentsResizingStrategy& strategy =
-        devToolsWindow_->GetContentsResizingStrategy();
-    devToolsWindow_->web_contents()->SetOverlayView(
+  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];
 }
 
 - (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 = devToolsWindow_->web_contents()->GetNativeView();
+  NSView* devToolsView = devTools_->GetNativeView();
   view_id_util::SetID(devToolsView, VIEW_ID_DEV_TOOLS_DOCKED);
 
   [devToolsContainerView_ showDevTools:devToolsView];
 }
 
 - (void)hideDevToolsView {
-  devToolsWindow_->web_contents()->RemoveOverlayView();
+  devTools_->RemoveOverlayView();
   [devToolsContainerView_ hideDevTools];
   [focusTracker_ restoreFocusInWindow:[devToolsContainerView_ window]];
   focusTracker_.reset();
 }
 
 @end