| Index: chrome/browser/devtools/devtools_window.h
|
| diff --git a/chrome/browser/devtools/devtools_window.h b/chrome/browser/devtools/devtools_window.h
|
| index a1238c7f0249b191b4d21940e02c5250110ac202..5cf23b164553635aedf69580b720958c989b7da6 100644
|
| --- a/chrome/browser/devtools/devtools_window.h
|
| +++ b/chrome/browser/devtools/devtools_window.h
|
| @@ -13,7 +13,7 @@
|
|
|
| class Browser;
|
| class BrowserWindow;
|
| -class DevToolsControllerTest;
|
| +class DevToolsWindowTesting;
|
| class DevToolsEventForwarder;
|
|
|
| namespace content {
|
| @@ -72,11 +72,6 @@ class DevToolsWindow : public DevToolsUIBindings::Delegate,
|
| static DevToolsWindow* OpenDevToolsWindow(
|
| content::RenderViewHost* inspected_rvh);
|
|
|
| - static DevToolsWindow* OpenDevToolsWindowForTest(
|
| - content::RenderViewHost* inspected_rvh, bool is_docked);
|
| - static DevToolsWindow* OpenDevToolsWindowForTest(
|
| - Browser* browser, bool is_docked);
|
| -
|
| // Perform specified action for current WebContents inside a |browser|.
|
| // This may close currently open DevTools window.
|
| static DevToolsWindow* ToggleDevToolsWindow(
|
| @@ -97,9 +92,6 @@ class DevToolsWindow : public DevToolsUIBindings::Delegate,
|
| static void InspectElement(
|
| content::RenderViewHost* inspected_rvh, int x, int y);
|
|
|
| - Browser* browser_for_test() { return browser_; }
|
| - content::WebContents* web_contents_for_test() { return main_web_contents_; }
|
| -
|
| // Sets closure to be called after load is done. If already loaded, calls
|
| // closure immediately.
|
| void SetLoadCompletedCallback(const base::Closure& closure);
|
| @@ -182,9 +174,7 @@ class DevToolsWindow : public DevToolsUIBindings::Delegate,
|
| static void OnPageCloseCanceled(content::WebContents* contents);
|
|
|
| private:
|
| - friend class DevToolsControllerTest;
|
| - friend class DevToolsSanityTest;
|
| - friend class BrowserWindowControllerTest;
|
| + friend class DevToolsWindowTesting;
|
|
|
| // DevTools lifecycle typically follows this way:
|
| // - Toggle/Open: client call;
|
| @@ -217,19 +207,22 @@ class DevToolsWindow : public DevToolsUIBindings::Delegate,
|
| content::RenderViewHost* inspected_rvh,
|
| bool shared_worker_frontend,
|
| bool external_frontend,
|
| - bool can_dock);
|
| + bool can_dock,
|
| + const std::string& settings);
|
| static GURL GetDevToolsURL(Profile* profile,
|
| const GURL& base_url,
|
| bool shared_worker_frontend,
|
| bool external_frontend,
|
| - bool can_dock);
|
| + bool can_dock,
|
| + const std::string& settings);
|
| static DevToolsWindow* FindDevToolsWindow(content::DevToolsAgentHost*);
|
| static DevToolsWindow* AsDevToolsWindow(content::WebContents*);
|
| static DevToolsWindow* CreateDevToolsWindowForWorker(Profile* profile);
|
| static DevToolsWindow* ToggleDevToolsWindow(
|
| content::RenderViewHost* inspected_rvh,
|
| bool force_open,
|
| - const DevToolsToggleAction& action);
|
| + const DevToolsToggleAction& action,
|
| + const std::string& settings);
|
|
|
| static std::string GetDevToolsWindowPlacementPrefKey();
|
|
|
| @@ -297,7 +290,6 @@ class DevToolsWindow : public DevToolsUIBindings::Delegate,
|
| void Show(const DevToolsToggleAction& action);
|
| void DoAction(const DevToolsToggleAction& action);
|
| void LoadCompleted();
|
| - void SetIsDockedAndShowImmediatelyForTest(bool is_docked);
|
| void UpdateBrowserToolbar();
|
| void UpdateBrowserWindow();
|
| content::WebContents* GetInspectedWebContents();
|
| @@ -313,12 +305,12 @@ class DevToolsWindow : public DevToolsUIBindings::Delegate,
|
| const bool can_dock_;
|
| LifeStage life_stage_;
|
| DevToolsToggleAction action_on_load_;
|
| - bool ignore_set_is_docked_;
|
| DevToolsContentsResizingStrategy contents_resizing_strategy_;
|
| // True if we're in the process of handling a beforeunload event originating
|
| // from the inspected webcontents, see InterceptPageBeforeUnload for details.
|
| bool intercepted_page_beforeunload_;
|
| base::Closure load_completed_callback_;
|
| + base::Closure close_callback_;
|
|
|
| base::TimeTicks inspect_element_start_time_;
|
| scoped_ptr<DevToolsEventForwarder> event_forwarder_;
|
|
|