Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(283)

Unified Diff: chrome/browser/devtools/devtools_window_testing.cc

Issue 972123003: Fixed behavior in case of disabled devtools (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/devtools/devtools_window.cc ('k') | chrome/browser/ui/apps/chrome_app_window_client.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/devtools/devtools_window_testing.cc
diff --git a/chrome/browser/devtools/devtools_window_testing.cc b/chrome/browser/devtools/devtools_window_testing.cc
index 3df89b45df2d5d7c003771309d48924d4ab0fc50..26fa6e3d7ad74dbe0395c5a2e1573d9b05e5054f 100644
--- a/chrome/browser/devtools/devtools_window_testing.cc
+++ b/chrome/browser/devtools/devtools_window_testing.cc
@@ -106,8 +106,11 @@ DevToolsWindow* DevToolsWindowTesting::OpenDevToolsWindowSync(
std::string settings = is_docked ?
"{\"currentDockState\":\"\\\"bottom\\\"\"}" :
"{\"currentDockState\":\"\\\"undocked\\\"\"}";
- DevToolsWindow* window = DevToolsWindow::ToggleDevToolsWindow(
- inspected_web_contents, true, DevToolsToggleAction::Show(), settings);
+ scoped_refptr<content::DevToolsAgentHost> agent(
+ content::DevToolsAgentHost::GetOrCreateFor(inspected_web_contents));
+ DevToolsWindow::ToggleDevToolsWindow(
+ inspected_web_contents, true, DevToolsToggleAction::Show(), settings);
+ DevToolsWindow* window = DevToolsWindow::FindDevToolsWindow(agent.get());
WaitForDevToolsWindowLoad(window);
return window;
}
@@ -123,8 +126,9 @@ DevToolsWindow* DevToolsWindowTesting::OpenDevToolsWindowSync(
// static
DevToolsWindow* DevToolsWindowTesting::OpenDevToolsWindowForWorkerSync(
Profile* profile, content::DevToolsAgentHost* worker_agent) {
- DevToolsWindow* window = DevToolsWindow::OpenDevToolsWindowForWorker(
+ DevToolsWindow::OpenDevToolsWindowForWorker(
profile, worker_agent);
+ DevToolsWindow* window = DevToolsWindow::FindDevToolsWindow(worker_agent);
WaitForDevToolsWindowLoad(window);
return window;
}
« no previous file with comments | « chrome/browser/devtools/devtools_window.cc ('k') | chrome/browser/ui/apps/chrome_app_window_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698