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

Unified Diff: content/browser/tab_contents/render_view_host_manager.cc

Issue 8549022: Define DevTools content API (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: jam's comments addressed Created 9 years, 1 month 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
Index: content/browser/tab_contents/render_view_host_manager.cc
diff --git a/content/browser/tab_contents/render_view_host_manager.cc b/content/browser/tab_contents/render_view_host_manager.cc
index 2aacafcbcc6011d2d15535063aa8d10d7495c220..f2d72a3e3a72f316f71e121026ba7f61e44dc344 100644
--- a/content/browser/tab_contents/render_view_host_manager.cc
+++ b/content/browser/tab_contents/render_view_host_manager.cc
@@ -6,7 +6,7 @@
#include "base/command_line.h"
#include "base/logging.h"
-#include "content/browser/debugger/devtools_manager.h"
+#include "content/browser/debugger/devtools_manager_impl.h"
#include "content/browser/renderer_host/render_view_host.h"
#include "content/browser/renderer_host/render_view_host_delegate.h"
#include "content/browser/renderer_host/render_view_host_factory.h"
@@ -753,11 +753,9 @@ void RenderViewHostManager::CancelPending() {
RenderViewHost* pending_render_view_host = pending_render_view_host_;
pending_render_view_host_ = NULL;
- DevToolsManager* devtools_manager = DevToolsManager::GetInstance();
- if (devtools_manager) { // NULL in unit tests.
- devtools_manager->OnCancelPendingNavigation(pending_render_view_host,
- render_view_host_);
- }
+ content::DevToolsManagerImpl::GetInstance()->OnCancelPendingNavigation(
+ pending_render_view_host,
+ render_view_host_);
// We no longer need to prevent the process from exiting.
pending_render_view_host->process()->RemovePendingView();
« no previous file with comments | « content/browser/debugger/worker_devtools_message_filter.cc ('k') | content/browser/tab_contents/tab_contents.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698