OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/devtools/devtools_window_testing.h" | 5 #include "chrome/browser/devtools/devtools_window_testing.h" |
6 | 6 |
7 #include "base/lazy_instance.h" | 7 #include "base/lazy_instance.h" |
8 #include "chrome/browser/devtools/devtools_window.h" | 8 #include "chrome/browser/devtools/devtools_window.h" |
9 #include "chrome/browser/ui/browser.h" | 9 #include "chrome/browser/ui/browser.h" |
10 #include "chrome/browser/ui/browser_window.h" | 10 #include "chrome/browser/ui/browser_window.h" |
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
94 // static | 94 // static |
95 void DevToolsWindowTesting::WaitForDevToolsWindowLoad(DevToolsWindow* window) { | 95 void DevToolsWindowTesting::WaitForDevToolsWindowLoad(DevToolsWindow* window) { |
96 scoped_refptr<content::MessageLoopRunner> runner = | 96 scoped_refptr<content::MessageLoopRunner> runner = |
97 new content::MessageLoopRunner; | 97 new content::MessageLoopRunner; |
98 window->SetLoadCompletedCallback(runner->QuitClosure()); | 98 window->SetLoadCompletedCallback(runner->QuitClosure()); |
99 runner->Run(); | 99 runner->Run(); |
100 } | 100 } |
101 | 101 |
102 // static | 102 // static |
103 DevToolsWindow* DevToolsWindowTesting::OpenDevToolsWindowSync( | 103 DevToolsWindow* DevToolsWindowTesting::OpenDevToolsWindowSync( |
104 content::RenderViewHost* inspected_rvh, | 104 content::WebContents* inspected_web_contents, |
105 bool is_docked) { | 105 bool is_docked) { |
106 std::string settings = is_docked ? | 106 std::string settings = is_docked ? |
107 "{\"currentDockState\":\"\\\"bottom\\\"\"}" : | 107 "{\"currentDockState\":\"\\\"bottom\\\"\"}" : |
108 "{\"currentDockState\":\"\\\"undocked\\\"\"}"; | 108 "{\"currentDockState\":\"\\\"undocked\\\"\"}"; |
109 DevToolsWindow* window = DevToolsWindow::ToggleDevToolsWindow( | 109 DevToolsWindow* window = DevToolsWindow::ToggleDevToolsWindow( |
110 inspected_rvh, true, DevToolsToggleAction::Show(), settings); | 110 inspected_web_contents, true, DevToolsToggleAction::Show(), settings); |
111 WaitForDevToolsWindowLoad(window); | 111 WaitForDevToolsWindowLoad(window); |
112 return window; | 112 return window; |
113 } | 113 } |
114 | 114 |
115 // static | 115 // static |
116 DevToolsWindow* DevToolsWindowTesting::OpenDevToolsWindowSync( | 116 DevToolsWindow* DevToolsWindowTesting::OpenDevToolsWindowSync( |
117 Browser* browser, | 117 Browser* browser, |
118 bool is_docked) { | 118 bool is_docked) { |
119 return OpenDevToolsWindowSync( | 119 return OpenDevToolsWindowSync( |
120 browser->tab_strip_model()->GetActiveWebContents()->GetRenderViewHost(), | 120 browser->tab_strip_model()->GetActiveWebContents(), is_docked); |
121 is_docked); | |
122 } | 121 } |
123 | 122 |
124 // static | 123 // static |
125 DevToolsWindow* DevToolsWindowTesting::OpenDevToolsWindowForWorkerSync( | 124 DevToolsWindow* DevToolsWindowTesting::OpenDevToolsWindowForWorkerSync( |
126 Profile* profile, content::DevToolsAgentHost* worker_agent) { | 125 Profile* profile, content::DevToolsAgentHost* worker_agent) { |
127 DevToolsWindow* window = DevToolsWindow::OpenDevToolsWindowForWorker( | 126 DevToolsWindow* window = DevToolsWindow::OpenDevToolsWindowForWorker( |
128 profile, worker_agent); | 127 profile, worker_agent); |
129 WaitForDevToolsWindowLoad(window); | 128 WaitForDevToolsWindowLoad(window); |
130 return window; | 129 return window; |
131 } | 130 } |
(...skipping 10 matching lines...) Expand all Loading... |
142 | 141 |
143 // static | 142 // static |
144 void DevToolsWindowTesting::CloseDevToolsWindowSync( | 143 void DevToolsWindowTesting::CloseDevToolsWindowSync( |
145 DevToolsWindow* window) { | 144 DevToolsWindow* window) { |
146 scoped_refptr<content::MessageLoopRunner> runner = | 145 scoped_refptr<content::MessageLoopRunner> runner = |
147 new content::MessageLoopRunner; | 146 new content::MessageLoopRunner; |
148 DevToolsWindowTesting::Get(window)->SetCloseCallback(runner->QuitClosure()); | 147 DevToolsWindowTesting::Get(window)->SetCloseCallback(runner->QuitClosure()); |
149 CloseDevToolsWindow(window); | 148 CloseDevToolsWindow(window); |
150 runner->Run(); | 149 runner->Run(); |
151 } | 150 } |
OLD | NEW |