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

chrome/browser/ui/cocoa/browser_window_controller.mm

 // Copyright 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/browser_window_controller.h"
 
 #include <cmath>
 #include <numeric>
 
 #include "base/command_line.h"
@@ skipping 633 matching lines @@
     [floatingBarBackingView_ setNeedsDisplay:YES];  // Okay even if nil.
 }
 
 // Called when we are activated (when we gain focus).
 - (void)windowDidBecomeKey:(NSNotification*)notification {
   // We need to activate the controls (in the "WebView"). To do this, get the
   // selected WebContents's RenderWidgetHostView and tell it to activate.
   if (WebContents* contents =
           browser_->tab_strip_model()->GetActiveWebContents()) {
 
-    DevToolsWindow* devtoolsWindow =
-        DevToolsWindow::GetDockedInstanceForInspectedTab(contents);
-    if (devtoolsWindow) {
-      RenderWidgetHostView* devtoolsView =
-          devtoolsWindow->web_contents()->GetRenderWidgetHostView();
+    WebContents* devtools = DevToolsWindow::GetInTabWebContents(
+        contents, NULL);

[Avi (use Gerrit), 2014/05/29 15:18:07]

Can you fit this on the previous line?

[dgozman, 2014/05/30 09:59:49]

I tried, but no.

+    if (devtools) {
+      RenderWidgetHostView* devtoolsView = devtools->GetRenderWidgetHostView();
       if (devtoolsView && devtoolsView->HasFocus()) {
         devtoolsView->SetActive(true);
         return;
       }
     }
 
     if (RenderWidgetHostView* rwhv = contents->GetRenderWidgetHostView())
       rwhv->SetActive(true);
   }
 }
 
 // Called when we are deactivated (when we lose focus).
 - (void)windowDidResignKey:(NSNotification*)notification {
   // If our app is still active and we're still the key window, ignore this
   // message, since it just means that a menu extra (on the "system status bar")
   // was activated; we'll get another |-windowDidResignKey| if we ever really
   // lose key window status.
   if ([NSApp isActive] && ([NSApp keyWindow] == [self window]))
     return;
 
   // We need to deactivate the controls (in the "WebView"). To do this, get the
   // selected WebContents's RenderWidgetHostView and tell it to deactivate.
   if (WebContents* contents =
           browser_->tab_strip_model()->GetActiveWebContents()) {
 
-    DevToolsWindow* devtoolsWindow =
-        DevToolsWindow::GetDockedInstanceForInspectedTab(contents);
-    if (devtoolsWindow) {
-      RenderWidgetHostView* devtoolsView =
-          devtoolsWindow->web_contents()->GetRenderWidgetHostView();
+    WebContents* devtools = DevToolsWindow::GetInTabWebContents(
+        contents, NULL);
+    if (devtools) {
+      RenderWidgetHostView* devtoolsView = devtools->GetRenderWidgetHostView();
       if (devtoolsView && devtoolsView->HasFocus()) {
         devtoolsView->SetActive(false);
         return;
       }
     }
 
     if (RenderWidgetHostView* rwhv = contents->GetRenderWidgetHostView())
       rwhv->SetActive(false);
   }
 }
@@ skipping 1605 matching lines @@
 
 - (BOOL)supportsBookmarkBar {
   return [self supportsWindowFeature:Browser::FEATURE_BOOKMARKBAR];
 }
 
 - (BOOL)isTabbedWindow {
   return browser_->is_type_tabbed();
 }
 
 @end  // @implementation BrowserWindowController(WindowType)