DevTools: untangle device discovery request from the devtools android bridge.

chrome/browser/devtools/devtools_window.h

 // 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.
 
 #ifndef CHROME_BROWSER_DEVTOOLS_DEVTOOLS_WINDOW_H_
 #define CHROME_BROWSER_DEVTOOLS_DEVTOOLS_WINDOW_H_
 
 #include "base/macros.h"
 #include "chrome/browser/devtools/devtools_contents_resizing_strategy.h"
 #include "chrome/browser/devtools/devtools_toggle_action.h"
@@ skipping 59 matching lines @@
   // How to get pointer to the created window see comments for
   // ToggleDevToolsWindow().
   static void OpenDevToolsWindow(content::WebContents* inspected_web_contents,
                                  const DevToolsToggleAction& action);
 
   // Open or reveal DevTools window, with no special action.
   // How to get pointer to the created window see comments for
   // ToggleDevToolsWindow().
   static void OpenDevToolsWindow(content::WebContents* inspected_web_contents);
 
-  // Open or reveal DevTools window. This window will be undocked.
+  // Open or reveal DevTools window, with no special action. Use |profile| to
+  // open client window in, default to |host|'s profile if none given.
   static void OpenDevToolsWindow(
-      Profile* profile,
-      const scoped_refptr<content::DevToolsAgentHost>& agent_host);
+      scoped_refptr<content::DevToolsAgentHost> host,
+      Profile* profile);
 
   // Perform specified action for current WebContents inside a |browser|.
   // This may close currently open DevTools window.
   // If DeveloperToolsDisabled policy is set, no DevTools window created.
   // In case if needed pointer to the created window one should use
   // DevToolsAgentHost and DevToolsWindow::FindDevToolsWindow(). E.g.:
   //
   // scoped_refptr<content::DevToolsAgentHost> agent(
   //   content::DevToolsAgentHost::GetOrCreateFor(inspected_web_contents));
   // DevToolsWindow::ToggleDevToolsWindow(
@@ skipping 116 matching lines @@
   content::WebContents* GetInspectedWebContents();
 
  private:
   friend class DevToolsWindowTesting;
   friend class DevToolsWindowCreationObserver;
 
   using CreationCallback = base::Callback<void(DevToolsWindow*)>;
   static void AddCreationCallbackForTest(const CreationCallback& callback);
   static void RemoveCreationCallbackForTest(const CreationCallback& callback);
 
+  static void OpenDevToolsWindowForFrame(
+      Profile* profile,
+      const scoped_refptr<content::DevToolsAgentHost>& agent_host);
+
   // DevTools lifecycle typically follows this way:
   // - Toggle/Open: client call;
   // - Create;
   // - ScheduleShow: setup window to be functional, but not yet show;
   // - DocumentOnLoadCompletedInMainFrame: frontend loaded;
   // - SetIsDocked: frontend decided on docking state;
   // - OnLoadCompleted: ready to present frontend;
   // - Show: actually placing frontend WebContents to a Browser or docked place;
   // - DoAction: perform action passed in Toggle/Open;
   // - ...;
@@ skipping 67 matching lines @@
       SkColor color,
       const std::vector<content::ColorSuggestion>& suggestions) override;
   void RunFileChooser(content::RenderFrameHost* render_frame_host,
                       const content::FileChooserParams& params) override;
   bool PreHandleGestureEvent(content::WebContents* source,
                              const blink::WebGestureEvent& event) override;
 
   // content::DevToolsUIBindings::Delegate overrides
   void ActivateWindow() override;
   void CloseWindow() override;
+  void Inspect(scoped_refptr<content::DevToolsAgentHost> host) override;
   void SetInspectedPageBounds(const gfx::Rect& rect) override;
   void InspectElementCompleted() override;
   void SetIsDocked(bool is_docked) override;
   void OpenInNewTab(const std::string& url) override;
   void SetWhitelistedShortcuts(const std::string& message) override;
   void InspectedContentsClosing() override;
   void OnLoadCompleted() override;
   void ReadyForTest() override;
   InfoBarService* GetInfoBarService() override;
   void RenderProcessGone(bool crashed) override;
@@ skipping 28 matching lines @@
   base::Closure ready_for_test_callback_;
 
   base::TimeTicks inspect_element_start_time_;
   std::unique_ptr<DevToolsEventForwarder> event_forwarder_;
 
   friend class DevToolsEventForwarder;
   DISALLOW_COPY_AND_ASSIGN(DevToolsWindow);
 };
 
 #endif  // CHROME_BROWSER_DEVTOOLS_DEVTOOLS_WINDOW_H_