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

chrome/browser/ui/views/frame/browser_view.cc

 // 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.
 
 #include "chrome/browser/ui/views/frame/browser_view.h"
 
 #include <algorithm>
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
@@ skipping 376 matching lines @@
       last_focused_view_storage_id_(
           views::ViewStorage::GetInstance()->CreateStorageID()),
       frame_(NULL),
       top_container_(NULL),
       tabstrip_(NULL),
       toolbar_(NULL),
       find_bar_host_view_(NULL),
       infobar_container_(NULL),
       contents_web_view_(NULL),
       contents_container_(NULL),
-      devtools_window_(NULL),
       initialized_(false),
       in_process_fullscreen_(false),
 #if defined(OS_WIN)
       hung_window_detector_(&hung_plugin_action_),
       ticker_(0),
 #endif
       force_location_bar_focus_(false),
 #if defined(OS_CHROMEOS)
       scroll_end_effect_controller_(ScrollEndEffectController::Create()),
 #endif
@@ skipping 1683 matching lines @@
 
 bool BrowserView::MaybeShowInfoBar(WebContents* contents) {
   // TODO(beng): Remove this function once the interface between
   //             InfoBarContainer, DownloadShelfView and WebContents and this
   //             view is sorted out.
   return true;
 }
 
 void BrowserView::UpdateDevToolsForContents(
     WebContents* web_contents, bool update_devtools_web_contents) {
-  DevToolsWindow* new_devtools_window = web_contents ?
-      DevToolsWindow::GetDockedInstanceForInspectedTab(web_contents) : NULL;
+  DevToolsContentsResizingStrategy strategy;
+  WebContents* devtools = DevToolsWindow::GetWebContentsToShowForInspectedTab(
+      web_contents, &strategy);
 
-  // Replace devtools WebContents.
-  WebContents* new_contents = new_devtools_window ?
-      new_devtools_window->web_contents() : NULL;
-  if (devtools_web_view_->web_contents() != new_contents &&
-      update_devtools_web_contents) {
-    devtools_web_view_->SetWebContents(new_contents);
-  }
-
-  if (!devtools_window_ && new_devtools_window &&
+  if (!devtools_web_view_->web_contents() && devtools &&
       !devtools_focus_tracker_.get()) {
     // Install devtools focus tracker when dev tools window is shown for the
     // first time.
     devtools_focus_tracker_.reset(
         new views::ExternalFocusTracker(devtools_web_view_,
                                         GetFocusManager()));
   }
 
   // Restore focus to the last focused view when hiding devtools window.
-  if (devtools_window_ && !new_devtools_window &&
+  if (devtools_web_view_->web_contents() && !devtools &&
       devtools_focus_tracker_.get()) {
     devtools_focus_tracker_->FocusLastFocusedExternalView();
     devtools_focus_tracker_.reset();
   }
 
-  devtools_window_ = new_devtools_window;
-  if (devtools_window_) {
-    devtools_web_view_->SetPreferredSize(devtools_window_->GetMinimumSize());
+  // Replace devtools WebContents.
+  if (devtools_web_view_->web_contents() != devtools &&
+      update_devtools_web_contents) {
+    devtools_web_view_->SetWebContents(devtools);
+  }
+
+  if (devtools) {
     devtools_web_view_->SetVisible(true);
-    GetContentsLayoutManager()->SetContentsResizingStrategy(
-        devtools_window_->GetContentsResizingStrategy());
+    GetContentsLayoutManager()->SetContentsResizingStrategy(strategy);
   } else {
     devtools_web_view_->SetVisible(false);
     GetContentsLayoutManager()->SetContentsResizingStrategy(
         DevToolsContentsResizingStrategy());
   }
   contents_container_->Layout();
 }
 
 void BrowserView::UpdateUIForContents(WebContents* contents) {
   bool needs_layout = MaybeShowBookmarkBar(contents);
@@ skipping 346 matching lines @@
 }
 
 void BrowserView::DoCutCopyPaste(void (WebContents::*method)(),
                                  int command_id) {
   WebContents* contents = browser_->tab_strip_model()->GetActiveWebContents();
   if (!contents)
     return;
   if (DoCutCopyPasteForWebContents(contents, method))
     return;
 
-  DevToolsWindow* devtools_window =
-      DevToolsWindow::GetDockedInstanceForInspectedTab(contents);
-  if (devtools_window &&
-      DoCutCopyPasteForWebContents(devtools_window->web_contents(), method)) {
+  WebContents* devtools =
+      DevToolsWindow::GetWebContentsToShowForInspectedTab(contents, NULL);
+  if (devtools && DoCutCopyPasteForWebContents(devtools, method))
     return;
-  }
 
   views::FocusManager* focus_manager = GetFocusManager();
   views::View* focused = focus_manager->GetFocusedView();
   if (focused &&
       (!strcmp(focused->GetClassName(), views::Textfield::kViewClassName) ||
        !strcmp(focused->GetClassName(), OmniboxViewViews::kViewClassName))) {
     views::Textfield* textfield = static_cast<views::Textfield*>(focused);
     textfield->ExecuteCommand(command_id);
   }
 }
@@ skipping 37 matching lines @@
       !GetLocationBar()->GetOmniboxView()->model()->popup_model()->IsOpen()) {
     gfx::Point icon_bottom(
         toolbar_->location_bar()->GetLocationBarAnchorPoint());
     ConvertPointToTarget(toolbar_->location_bar(), this, &icon_bottom);
     gfx::Point infobar_top(0, infobar_container_->GetVerticalOverlap(NULL));
     ConvertPointToTarget(infobar_container_, this, &infobar_top);
     top_arrow_height = infobar_top.y() - icon_bottom.y();
   }
   return top_arrow_height;
 }