DevTools: Open Elements panel sooner on Inspect Element

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/command_line.h"
 #include "base/json/json_reader.h"
@@ skipping 446 matching lines @@
       return;
     window->bindings_->AttachTo(worker_agent);
   }
   window->ScheduleShow(DevToolsToggleAction::Show());
 }
 
 // static
 DevToolsWindow* DevToolsWindow::CreateDevToolsWindowForWorker(
     Profile* profile) {
   content::RecordAction(base::UserMetricsAction("DevTools_InspectWorker"));
-  return Create(profile, GURL(), NULL, true, false, std::string(), false, "");
+  return Create(profile, GURL(), NULL, true, false, std::string(), false, "",
+                "");
 }
 
 // static
 void DevToolsWindow::OpenDevToolsWindow(
     content::WebContents* inspected_web_contents) {
   ToggleDevToolsWindow(
         inspected_web_contents, true, DevToolsToggleAction::Show(), "");
 }
 
 // static
@@ skipping 39 matching lines @@
   ToggleDevToolsWindow(inspected_web_contents, true, action, "");
 }
 
 // static
 void DevToolsWindow::OpenDevToolsWindowForFrame(
     Profile* profile,
     const scoped_refptr<content::DevToolsAgentHost>& agent_host) {
   DevToolsWindow* window = FindDevToolsWindow(agent_host.get());
   if (!window) {
     window = DevToolsWindow::Create(profile, GURL(), nullptr, false, false,
-                                    std::string(), false, std::string());
+                                    std::string(), false, std::string(),
+                                    std::string());

[einbinder, 2016/12/09 00:28:56]

Do we prefer std::string() over ""? Both seem to get used.

[dgozman, 2016/12/09 22:19:31]

Should not matter.

     if (!window)
       return;
     window->bindings_->AttachTo(agent_host);
   }
   window->ScheduleShow(DevToolsToggleAction::Show());
 }
 
 // static
 void DevToolsWindow::ToggleDevToolsWindow(
     Browser* browser,
@@ skipping 13 matching lines @@
 // static
 void DevToolsWindow::OpenExternalFrontend(
     Profile* profile,
     const std::string& frontend_url,
     const scoped_refptr<content::DevToolsAgentHost>& agent_host,
     bool is_worker,
     bool is_v8_only) {
   DevToolsWindow* window = FindDevToolsWindow(agent_host.get());
   if (!window) {
     window = Create(profile, GURL(), nullptr, is_worker, is_v8_only,
-        DevToolsUI::GetProxyURL(frontend_url).spec(), false, std::string());
+                    DevToolsUI::GetProxyURL(frontend_url).spec(), false,
+                    std::string(), std::string());
     if (!window)
       return;
     window->bindings_->AttachTo(agent_host);
     window->close_on_detach_ = false;
   }
 
   window->ScheduleShow(DevToolsToggleAction::Show());
 }
 
 // static
 void DevToolsWindow::ToggleDevToolsWindow(
     content::WebContents* inspected_web_contents,
     bool force_open,
     const DevToolsToggleAction& action,
     const std::string& settings) {
   scoped_refptr<DevToolsAgentHost> agent(
       DevToolsAgentHost::GetOrCreateFor(inspected_web_contents));
   DevToolsWindow* window = FindDevToolsWindow(agent.get());
   bool do_open = force_open;
   if (!window) {
     Profile* profile = Profile::FromBrowserContext(
         inspected_web_contents->GetBrowserContext());
     content::RecordAction(
         base::UserMetricsAction("DevTools_InspectRenderer"));
-    window = Create(profile, GURL(), inspected_web_contents,
-                    false, false, std::string(), true, settings);
+    std::string panel = "";
+    switch (action.type()) {
+      case DevToolsToggleAction::kInspect:
+        panel = "elements";
+        break;
+      case DevToolsToggleAction::kShowSecurityPanel:
+        panel = "security";
+        break;
+      case DevToolsToggleAction::kShowConsole:
+        panel = "console";
+        break;
+      case DevToolsToggleAction::kShow:
+      case DevToolsToggleAction::kToggle:
+      case DevToolsToggleAction::kReveal:
+      case DevToolsToggleAction::kNoOp:
+        break;
+      default:

[dgozman, 2016/12/09 22:19:31]

Omit the default clause.

[einbinder, 2016/12/12 22:04:27]

Done.

+        NOTREACHED();
+        break;
+    }
+    window = Create(profile, GURL(), inspected_web_contents, false, false,
+                    std::string(), true, settings, panel);
     if (!window)
       return;
     window->bindings_->AttachTo(agent.get());
     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();
 }
 
 // static
 void DevToolsWindow::InspectElement(
     content::RenderFrameHost* inspected_frame_host,
     int x,
     int y) {
   scoped_refptr<DevToolsAgentHost> agent(
       DevToolsAgentHost::GetOrCreateFor(inspected_frame_host));
   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.
   if (agent->GetType() == content::DevToolsAgentHost::kTypePage) {
-    OpenDevToolsWindow(agent->GetWebContents());
+    OpenDevToolsWindow(agent->GetWebContents(),
+                       DevToolsToggleAction::Inspect());

[einbinder, 2016/12/09 00:28:56]

The Inspect action is for Ctrl+Shift+C. I'm borrowing it here for right click
inspect element, but I'm not sure if that will cause problems.

[dgozman, 2016/12/09 22:19:31]

Let's do action ShowElementsPanel, and rename console to ShowConsolePanel.

[einbinder, 2016/12/12 22:04:27]

Done.

   } else {
     OpenDevToolsWindowForFrame(Profile::FromBrowserContext(
                                    agent->GetBrowserContext()), agent);
   }
   DevToolsWindow* window = FindDevToolsWindow(agent.get());
   if (window) {
     agent->InspectElement(window->bindings_, x, y);
     if (should_measure_time)
       window->inspect_element_start_time_ = start_time;
   }
@@ skipping 14 matching lines @@
     Show(DevToolsToggleAction::Show());
   }
 }
 
 void DevToolsWindow::Show(const DevToolsToggleAction& action) {
   if (life_stage_ == kClosing)
     return;
 
   if (action.type() == DevToolsToggleAction::kNoOp)
     return;
-
   if (is_docked_) {
     DCHECK(can_dock_);
     Browser* inspected_browser = NULL;
     int inspected_tab_index = -1;
     FindInspectedBrowserAndTabIndex(GetInspectedWebContents(),
                                     &inspected_browser,
                                     &inspected_tab_index);
     DCHECK(inspected_browser);
     DCHECK(inspected_tab_index != -1);
 
@@ skipping 170 matching lines @@
 
 // static
 DevToolsWindow* DevToolsWindow::Create(
     Profile* profile,
     const GURL& frontend_url,
     content::WebContents* inspected_web_contents,
     bool shared_worker_frontend,
     bool v8_only_frontend,
     const std::string& remote_frontend,
     bool can_dock,
-    const std::string& settings) {
+    const std::string& settings,
+    const std::string& panel) {
   if (profile->GetPrefs()->GetBoolean(prefs::kDevToolsDisabled) ||
       base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kKioskMode))
     return nullptr;
 
   if (inspected_web_contents) {
     // Check for a place to dock.
     Browser* browser = NULL;
     int tab;
     if (!FindInspectedBrowserAndTabIndex(inspected_web_contents,
                                          &browser, &tab) ||
         browser->is_type_popup()) {
       can_dock = false;
     }
   }
 
   // Create WebContents with devtools.
-  GURL url(GetDevToolsURL(profile, frontend_url,
-                          shared_worker_frontend,
-                          v8_only_frontend,
-                          remote_frontend,
-                          can_dock));
+  GURL url(GetDevToolsURL(profile, frontend_url, shared_worker_frontend,
+                          v8_only_frontend, remote_frontend, can_dock, panel));
   std::unique_ptr<WebContents> main_web_contents(
       WebContents::Create(WebContents::CreateParams(profile)));
   main_web_contents->GetController().LoadURL(
       DecorateFrontendURL(url), content::Referrer(),
       ui::PAGE_TRANSITION_AUTO_TOPLEVEL, std::string());
   DevToolsUIBindings* bindings =
       DevToolsUIBindings::ForWebContents(main_web_contents.get());
   if (!bindings)
     return nullptr;
   if (!settings.empty())
     SetPreferencesFromJson(profile, settings);
   return new DevToolsWindow(profile, main_web_contents.release(), bindings,
                             inspected_web_contents, can_dock);
 }
 
 // static
 GURL DevToolsWindow::GetDevToolsURL(Profile* profile,
                                     const GURL& base_url,
                                     bool shared_worker_frontend,
                                     bool v8_only_frontend,
                                     const std::string& remote_frontend,
-                                    bool can_dock) {
+                                    bool can_dock,
+                                    const std::string& panel) {
   // Compatibility errors are encoded with data urls, pass them
   // through with no decoration.
   if (base_url.SchemeIs("data"))
     return base_url;
 
   std::string frontend_url(
       !remote_frontend.empty() ?
           remote_frontend :
           base_url.is_empty() ? chrome::kChromeUIDevToolsURL : base_url.spec());
   std::string url_string(
       frontend_url +
       ((frontend_url.find("?") == std::string::npos) ? "?" : "&"));
   if (shared_worker_frontend)
     url_string += "&isSharedWorker=true";
   if (v8_only_frontend)
     url_string += "&v8only=true";
   if (remote_frontend.size()) {
     url_string += "&remoteFrontend=true";
   } else {
     url_string += "&remoteBase=" + DevToolsUI::GetRemoteBaseURL().spec();
   }
   if (can_dock)
     url_string += "&can_dock=true";
+  if (panel.size())
+    url_string += "&panel=" + panel;

[einbinder, 2016/12/09 00:28:56]

Concatenating the string here feels dangerous.

   return DevToolsUI::SanitizeFrontendURL(GURL(url_string));
 }
 
 // static
 DevToolsWindow* DevToolsWindow::FindDevToolsWindow(
     DevToolsAgentHost* agent_host) {
   if (!agent_host || g_instances == NULL)
     return NULL;
   DevToolsWindows* instances = g_instances.Pointer();
   for (DevToolsWindows::iterator it(instances->begin()); it != instances->end();
@@ skipping 384 matching lines @@
                                     NULL);
       break;
     }
     case DevToolsToggleAction::kShowSecurityPanel: {
       base::StringValue panel_name("security");
       bindings_->CallClientFunction("DevToolsAPI.showPanel", &panel_name, NULL,
                                     NULL);
       break;
     }
     case DevToolsToggleAction::kInspect:
-      bindings_->CallClientFunction(
-          "DevToolsAPI.enterInspectElementMode", NULL, NULL, NULL);
+      bindings_->CallClientFunction("DevToolsAPI.enterInspectElementMode", NULL,
+                                    NULL, NULL);
       break;
 
     case DevToolsToggleAction::kShow:
     case DevToolsToggleAction::kToggle:
       // Do nothing.
       break;
 
     case DevToolsToggleAction::kReveal: {
       const DevToolsToggleAction::RevealParams* params =
           action.params();
@@ skipping 56 matching lines @@
 bool DevToolsWindow::ReloadInspectedWebContents(bool bypass_cache) {
   // Only route reload via front-end if the agent is attached.
   WebContents* wc = GetInspectedWebContents();
   if (!wc || wc->GetCrashedStatus() != base::TERMINATION_STATUS_STILL_RUNNING)
     return false;
   base::FundamentalValue bypass_cache_value(bypass_cache);
   bindings_->CallClientFunction("DevToolsAPI.reloadInspectedPage",
                                 &bypass_cache_value, nullptr, nullptr);
   return true;
 }