summaryrefslogtreecommitdiffstats
path: root/chrome/browser/renderer_host
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/renderer_host')
-rw-r--r--chrome/browser/renderer_host/render_view_host.cc18
-rw-r--r--chrome/browser/renderer_host/render_view_host.h6
2 files changed, 3 insertions, 21 deletions
diff --git a/chrome/browser/renderer_host/render_view_host.cc b/chrome/browser/renderer_host/render_view_host.cc
index 3a8cb2c..8833c41 100644
--- a/chrome/browser/renderer_host/render_view_host.cc
+++ b/chrome/browser/renderer_host/render_view_host.cc
@@ -12,7 +12,6 @@
#include "base/string_util.h"
#include "base/time.h"
#include "base/waitable_event.h"
-#include "chrome/browser/browser_process.h"
#include "chrome/browser/child_process_security_policy.h"
#include "chrome/browser/cross_site_request_manager.h"
#include "chrome/browser/debugger/devtools_manager.h"
@@ -119,7 +118,7 @@ RenderViewHost::RenderViewHost(SiteInstance* instance,
}
RenderViewHost::~RenderViewHost() {
- DevToolsManager* devtools_manager = g_browser_process->devtools_manager();
+ DevToolsManager* devtools_manager = DevToolsManager::GetInstance();
if (devtools_manager) // NULL in tests
devtools_manager->UnregisterDevToolsClientHostFor(this);
@@ -562,16 +561,6 @@ void RenderViewHost::CopyImageAt(int x, int y) {
Send(new ViewMsg_CopyImageAt(routing_id(), x, y));
}
-void RenderViewHost::InspectElementAt(int x, int y) {
- DevToolsManager* manager = g_browser_process->devtools_manager();
- manager->InspectElement(this, x, y);
-}
-
-void RenderViewHost::ShowJavaScriptConsole() {
- DevToolsManager* manager = g_browser_process->devtools_manager();
- manager->OpenDevToolsWindow(this);
-}
-
void RenderViewHost::DragSourceEndedAt(
int client_x, int client_y, int screen_x, int screen_y) {
Send(new ViewMsg_DragSourceEndedOrMoved(
@@ -1234,12 +1223,11 @@ void RenderViewHost::OnAddMessageToConsole(const std::wstring& message,
}
void RenderViewHost::OnForwardToDevToolsAgent(const IPC::Message& message) {
- g_browser_process->devtools_manager()->ForwardToDevToolsAgent(this, message);
+ DevToolsManager::GetInstance()->ForwardToDevToolsAgent(this, message);
}
void RenderViewHost::OnForwardToDevToolsClient(const IPC::Message& message) {
- g_browser_process->devtools_manager()->ForwardToDevToolsClient(this,
- message);
+ DevToolsManager::GetInstance()->ForwardToDevToolsClient(this, message);
}
void RenderViewHost::OnUserMetricsRecordAction(const std::wstring& action) {
diff --git a/chrome/browser/renderer_host/render_view_host.h b/chrome/browser/renderer_host/render_view_host.h
index 84051f2..16e0acc 100644
--- a/chrome/browser/renderer_host/render_view_host.h
+++ b/chrome/browser/renderer_host/render_view_host.h
@@ -285,12 +285,6 @@ class RenderViewHost : public RenderWidgetHost {
// Copies the image at the specified point.
void CopyImageAt(int x, int y);
- // Inspects the element at the specified point using the Web Inspector.
- void InspectElementAt(int x, int y);
-
- // Show the JavaScript console.
- void ShowJavaScriptConsole();
-
// Notifies the renderer that a drop occurred. This is necessary because the
// render may be the one that started the drag.
void DragSourceEndedAt(