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

Unified Diff: chrome/test/testing_browser_process.cc

Issue 7565008: DevTools: don't show the unresponsive dialog for inspected tabs (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Don't reset DevToolsManager Created 9 years, 4 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/test/testing_browser_process.h ('k') | content/browser/debugger/devtools_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/testing_browser_process.cc
diff --git a/chrome/test/testing_browser_process.cc b/chrome/test/testing_browser_process.cc
index f194a0b1bc389a93f9e3ab193d60f7cbdc6376e8..244a3ff39a20dee6c3faccb66a101320b9ccc1ea 100644
--- a/chrome/test/testing_browser_process.cc
+++ b/chrome/test/testing_browser_process.cc
@@ -12,6 +12,7 @@
#include "chrome/browser/prerender/prerender_tracker.h"
#include "chrome/browser/printing/background_printing_manager.h"
#include "chrome/browser/profiles/profile_manager.h"
+#include "content/browser/debugger/devtools_manager.h"
#include "net/url_request/url_request_context_getter.h"
#include "ui/base/clipboard/clipboard.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -20,7 +21,8 @@ TestingBrowserProcess::TestingBrowserProcess()
: module_ref_count_(0),
app_locale_("en"),
local_state_(NULL),
- io_thread_(NULL) {
+ io_thread_(NULL),
+ devtools_manager_(NULL) {
}
TestingBrowserProcess::~TestingBrowserProcess() {
@@ -96,7 +98,7 @@ ThumbnailGenerator* TestingBrowserProcess::GetThumbnailGenerator() {
}
DevToolsManager* TestingBrowserProcess::devtools_manager() {
- return NULL;
+ return devtools_manager_.get();
}
SidebarManager* TestingBrowserProcess::sidebar_manager() {
@@ -262,6 +264,10 @@ void TestingBrowserProcess::SetIOThread(IOThread* io_thread) {
io_thread_ = io_thread;
}
+void TestingBrowserProcess::SetDevToolsManager(DevToolsManager* manager) {
+ devtools_manager_.reset(manager);
+}
+
ScopedTestingBrowserProcess::ScopedTestingBrowserProcess() {
// TODO(phajdan.jr): Temporary, for http://crbug.com/61062.
// ChromeTestSuite sets up a global TestingBrowserProcess
« no previous file with comments | « chrome/test/testing_browser_process.h ('k') | content/browser/debugger/devtools_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698