DevTools: migrate DevTools APIs to use WebContents instead of RenderViewHost.

chrome/browser/devtools/devtools_window.cc

 // 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.
 
 #include "chrome/browser/devtools/devtools_window.h"
 
 #include <algorithm>
 
 #include "base/json/json_reader.h"
 #include "base/metrics/histogram.h"
@@ skipping 424 matching lines @@
 
 // static
 DevToolsWindow* DevToolsWindow::CreateDevToolsWindowForWorker(
     Profile* profile) {
   content::RecordAction(base::UserMetricsAction("DevTools_InspectWorker"));
   return Create(profile, GURL(), NULL, true, false, false, "");
 }
 
 // static
 DevToolsWindow* DevToolsWindow::OpenDevToolsWindow(
-    content::RenderViewHost* inspected_rvh) {
+    content::WebContents* inspected_web_contents) {
   return ToggleDevToolsWindow(
-      inspected_rvh, true, DevToolsToggleAction::Show(), "");
+      inspected_web_contents, true, DevToolsToggleAction::Show(), "");
 }
 
 // static
 DevToolsWindow* DevToolsWindow::OpenDevToolsWindow(
-    content::RenderViewHost* inspected_rvh,
+    content::WebContents* inspected_web_contents,
     const DevToolsToggleAction& action) {
-  return ToggleDevToolsWindow(inspected_rvh, true, action, "");
+  return ToggleDevToolsWindow(inspected_web_contents, true, action, "");
 }
 
 // static
 DevToolsWindow* DevToolsWindow::ToggleDevToolsWindow(
     Browser* browser,
     const DevToolsToggleAction& action) {
   if (action.type() == DevToolsToggleAction::kToggle &&
       browser->is_devtools()) {
     browser->tab_strip_model()->CloseAllTabs();
     return NULL;
   }
 
-  return ToggleDevToolsWindow(
-      browser->tab_strip_model()->GetActiveWebContents()->GetRenderViewHost(),
+  DevToolsWindow* result = ToggleDevToolsWindow(

[dgozman, 2014/08/06 13:06:09]

Unnecessary |result| variable.

[pfeldman, 2014/08/06 16:26:35]

Done.

+      browser->tab_strip_model()->GetActiveWebContents(),
       action.type() == DevToolsToggleAction::kInspect, action, "");
+
+
+  return result;
 }
 
 // static
 void DevToolsWindow::OpenExternalFrontend(
     Profile* profile,
     const std::string& frontend_url,
     content::DevToolsAgentHost* agent_host) {
   DevToolsWindow* window = FindDevToolsWindow(agent_host);
   if (!window) {
     window = Create(profile, DevToolsUI::GetProxyURL(frontend_url), NULL,
                     false, true, false, "");
     content::DevToolsManager::GetInstance()->RegisterDevToolsClientHostFor(
         agent_host, window->bindings_);
   }
   window->ScheduleShow(DevToolsToggleAction::Show());
 }
 
 // static
 DevToolsWindow* DevToolsWindow::ToggleDevToolsWindow(
-    content::RenderViewHost* inspected_rvh,
+    content::WebContents* inspected_web_contents,
     bool force_open,
     const DevToolsToggleAction& action,
     const std::string& settings) {
   scoped_refptr<DevToolsAgentHost> agent(
-      DevToolsAgentHost::GetOrCreateFor(inspected_rvh));
+      DevToolsAgentHost::GetOrCreateFor(inspected_web_contents));
   content::DevToolsManager* manager = content::DevToolsManager::GetInstance();
   DevToolsWindow* window = FindDevToolsWindow(agent.get());
   bool do_open = force_open;
   if (!window) {
     Profile* profile = Profile::FromBrowserContext(
-        inspected_rvh->GetProcess()->GetBrowserContext());
+        inspected_web_contents->GetBrowserContext());
     content::RecordAction(
         base::UserMetricsAction("DevTools_InspectRenderer"));
     window = Create(
-        profile, GURL(), inspected_rvh, false, false, true, settings);
+        profile, GURL(), inspected_web_contents, false, false, true, settings);
     manager->RegisterDevToolsClientHostFor(agent.get(), window->bindings_);
     do_open = true;
   }
 
   // Update toolbar to reflect DevTools changes.
   window->UpdateBrowserToolbar();
 
   // If window is docked and visible, we hide it on toggle. If window is
   // undocked, we show (activate) it.
   if (!window->is_docked_ || do_open)
     window->ScheduleShow(action);
   else
     window->CloseWindow();
 
   return window;
 }
 
 // static
-void DevToolsWindow::InspectElement(content::RenderViewHost* inspected_rvh,
-                                    int x,
-                                    int y) {
+void DevToolsWindow::InspectElement(
+    content::WebContents* inspected_web_contents, int x, int y) {
   scoped_refptr<DevToolsAgentHost> agent(
-      DevToolsAgentHost::GetOrCreateFor(inspected_rvh));
+      DevToolsAgentHost::GetOrCreateFor(inspected_web_contents));
   agent->InspectElement(x, y);
   bool should_measure_time = FindDevToolsWindow(agent.get()) == NULL;
   base::TimeTicks start_time = base::TimeTicks::Now();
   // TODO(loislo): we should initiate DevTools window opening from within
   // renderer. Otherwise, we still can hit a race condition here.
-  DevToolsWindow* window = OpenDevToolsWindow(inspected_rvh);
+  DevToolsWindow* window = OpenDevToolsWindow(inspected_web_contents);
   if (should_measure_time)
     window->inspect_element_start_time_ = start_time;
 }
 
 void DevToolsWindow::ScheduleShow(const DevToolsToggleAction& action) {
   if (life_stage_ == kLoadCompleted) {
     Show(action);
     return;
   }
 
@@ skipping 128 matching lines @@
       DevToolsWindow::GetInstanceForInspectedWebContents(contents);
   if (!window)
     return;
   window->intercepted_page_beforeunload_ = false;
   // Propagate to devtools opened on devtools if any.
   DevToolsWindow::OnPageCloseCanceled(window->main_web_contents_);
 }
 
 DevToolsWindow::DevToolsWindow(Profile* profile,
                                const GURL& url,
-                               content::RenderViewHost* inspected_rvh,
+                               content::WebContents* inspected_web_contents,
                                bool can_dock)
     : profile_(profile),
       main_web_contents_(
           WebContents::Create(WebContents::CreateParams(profile))),
       toolbox_web_contents_(NULL),
       bindings_(NULL),
       browser_(NULL),
       is_docked_(true),
       can_dock_(can_dock),
       // This initialization allows external front-end to work without changes.
@@ skipping 11 matching lines @@
   // Bindings take ownership over devtools as its delegate.
   bindings_->SetDelegate(this);
   // DevTools uses chrome_page_zoom::Zoom(), so main_web_contents_ requires a
   // ZoomController.
   ZoomController::CreateForWebContents(main_web_contents_);
   ZoomController::FromWebContents(main_web_contents_)
       ->SetShowsNotificationBubble(false);
 
   g_instances.Get().push_back(this);
 
-  // There is no inspected_rvh in case of shared workers.
-  if (inspected_rvh)
+  // There is no inspected_web_contents in case of shared workers.
+  if (inspected_web_contents)
     inspected_contents_observer_.reset(new ObserverWithAccessor(
-        content::WebContents::FromRenderViewHost(inspected_rvh)));
+        inspected_web_contents));
 
   // Initialize docked page to be of the right size.
-  WebContents* inspected_web_contents = GetInspectedWebContents();
   if (can_dock_ && inspected_web_contents) {
     content::RenderWidgetHostView* inspected_view =
         inspected_web_contents->GetRenderWidgetHostView();
     if (inspected_view && main_web_contents_->GetRenderWidgetHostView()) {
       gfx::Size size = inspected_view->GetViewBounds().size();
       main_web_contents_->GetRenderWidgetHostView()->SetSize(size);
     }
   }
 
   event_forwarder_.reset(new DevToolsEventForwarder(this));
 }
 
 // static
 DevToolsWindow* DevToolsWindow::Create(
     Profile* profile,
     const GURL& frontend_url,
-    content::RenderViewHost* inspected_rvh,
+    content::WebContents* inspected_web_contents,
     bool shared_worker_frontend,
     bool external_frontend,
     bool can_dock,
     const std::string& settings) {
-  if (inspected_rvh) {
+  if (inspected_web_contents) {
     // Check for a place to dock.
     Browser* browser = NULL;
     int tab;
-    WebContents* inspected_web_contents =
-        content::WebContents::FromRenderViewHost(inspected_rvh);
     if (!FindInspectedBrowserAndTabIndex(inspected_web_contents,
                                          &browser, &tab) ||
-        inspected_rvh->GetMainFrame()->IsCrossProcessSubframe() ||
         browser->is_type_popup()) {
       can_dock = false;
     }
   }
 
   // Create WebContents with devtools.
   GURL url(GetDevToolsURL(profile, frontend_url,
                           shared_worker_frontend,
                           external_frontend,
                           can_dock, settings));
-  return new DevToolsWindow(profile, url, inspected_rvh, can_dock);
+  return new DevToolsWindow(profile, url, inspected_web_contents, can_dock);
 }
 
 // static
 GURL DevToolsWindow::GetDevToolsURL(Profile* profile,
                                     const GURL& base_url,
                                     bool shared_worker_frontend,
                                     bool external_frontend,
                                     bool can_dock,
                                     const std::string& settings) {
   // Compatibility errors are encoded with data urls, pass them
@@ skipping 486 matching lines @@
       closure.Run();
     return;
   }
   load_completed_callback_ = closure;
 }
 
 bool DevToolsWindow::ForwardKeyboardEvent(
     const content::NativeWebKeyboardEvent& event) {
   return event_forwarder_->ForwardEvent(event);
 }