summaryrefslogtreecommitdiffstats
path: root/content/shell/browser/shell.cc
diff options
context:
space:
mode:
authordgozman@chromium.org <dgozman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-08 22:46:19 +0000
committerdgozman@chromium.org <dgozman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-08 22:47:50 +0000
commitd3607a09b3587fe43705b932c99193fbc951c1e8 (patch)
treef1e2404e9e151fa2ff88f5f434c6a3277d637e56 /content/shell/browser/shell.cc
parented50a2fd22c824e01ba754b91f81cbdbbc3c7f10 (diff)
downloadchromium_src-d3607a09b3587fe43705b932c99193fbc951c1e8.zip
chromium_src-d3607a09b3587fe43705b932c99193fbc951c1e8.tar.gz
chromium_src-d3607a09b3587fe43705b932c99193fbc951c1e8.tar.bz2
[DevTools] Make DevTools clients talk directly to DevToolsAgentHost instead of using DevToolsManager.
Previously, client used methods on DevToolsManager passing |this| to most of them. Instead, it should hold a scoped_refptr to inspected DevToolsAgentHost and talk to it directly. This creates a single clean entry point for the client, and allows in the future to handle browser-wide protocol messages and debug multiple hosts at once. BUG=401073 TBR=kalman@chromium.org Review URL: https://codereview.chromium.org/449043002 Cr-Commit-Position: refs/heads/master@{#288452} git-svn-id: svn://svn.chromium.org/chrome/trunk/src@288452 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/shell/browser/shell.cc')
-rw-r--r--content/shell/browser/shell.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/content/shell/browser/shell.cc b/content/shell/browser/shell.cc
index c63ff15..b10943d 100644
--- a/content/shell/browser/shell.cc
+++ b/content/shell/browser/shell.cc
@@ -12,7 +12,7 @@
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
-#include "content/public/browser/devtools_manager.h"
+#include "content/public/browser/devtools_agent_host.h"
#include "content/public/browser/navigation_controller.h"
#include "content/public/browser/navigation_entry.h"
#include "content/public/browser/render_view_host.h"
@@ -114,7 +114,7 @@ Shell* Shell::CreateShell(WebContents* web_contents,
void Shell::CloseAllWindows() {
base::AutoReset<bool> auto_reset(&quit_message_loop_, false);
- DevToolsManager::GetInstance()->CloseAllClientHosts();
+ DevToolsAgentHost::DetachAllClients();
std::vector<Shell*> open_windows(windows_);
for (size_t i = 0; i < open_windows.size(); ++i)
open_windows[i]->Close();