Highlight node with mouse over it while selecting element to inspect

BUG=20969
TEST=none

Review URL: http://codereview.chromium.org/348056

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31087 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 1 insertions, 35 deletions

diff --git a/chrome/browser/debugger/devtools_manager.cc b/chrome/browser/debugger/devtools_manager.cc
index 2028904..3ffd1e0 100644
--- a/chrome/browser/debugger/devtools_manager.cc
+++ b/chrome/browser/debugger/devtools_manager.cc
@@ -119,15 +119,6 @@ void DevToolsManager::UndockWindow(RenderViewHost* client_rvh) {
   ReopenWindow(client_rvh, false);
 }
 
-void DevToolsManager::ToggleInspectElementMode(RenderViewHost* client_rvh,
-                                               bool enabled) {
-  DevToolsClientHost* client_host = FindOnwerDevToolsClientHost(client_rvh);
-  DCHECK(client_host);
-  RenderViewHost* inspected_rvh = GetInspectedRenderViewHost(client_host);
-  DCHECK(inspected_rvh);
-  inspected_rvh->set_in_inspect_element_mode(enabled);
-}
-
 void DevToolsManager::OpenDevToolsWindow(RenderViewHost* inspected_rvh) {
   ToggleDevToolsWindow(inspected_rvh, true);
 }
diff --git a/chrome/browser/debugger/devtools_manager.h b/chrome/browser/debugger/devtools_manager.h
index 56ffb3f8..fc33aa2 100644
--- a/chrome/browser/debugger/devtools_manager.h
+++ b/chrome/browser/debugger/devtools_manager.h
@@ -53,7 +53,6 @@ class DevToolsManager : public DevToolsClientHost::CloseListener,
   void CloseWindow(RenderViewHost* client_rvn);
   void DockWindow(RenderViewHost* client_rvn);
   void UndockWindow(RenderViewHost* client_rvn);
-  void ToggleInspectElementMode(RenderViewHost* client_rvh, bool enabled);
 
   void OpenDevToolsWindow(RenderViewHost* inspected_rvh);
   void ToggleDevToolsWindow(RenderViewHost* inspected_rvh);
diff --git a/chrome/browser/renderer_host/render_view_host.cc b/chrome/browser/renderer_host/render_view_host.cc
index a2749a7..5849459 100644
--- a/chrome/browser/renderer_host/render_view_host.cc
+++ b/chrome/browser/renderer_host/render_view_host.cc
@@ -117,8 +117,7 @@ RenderViewHost::RenderViewHost(SiteInstance* instance,
       is_waiting_for_unload_ack_(false),
       unload_ack_is_for_cross_site_transition_(false),
       are_javascript_messages_suppressed_(false),
-      sudden_termination_allowed_(false),
-      in_inspect_element_mode_(false) {
+      sudden_termination_allowed_(false) {
   DCHECK(instance_);
   DCHECK(delegate_);
 
@@ -806,8 +805,6 @@ void RenderViewHost::OnMessageReceived(const IPC::Message& msg) {
                         OnDockDevToolsWindow);
     IPC_MESSAGE_HANDLER(ViewHostMsg_UndockDevToolsWindow,
                         OnUndockDevToolsWindow);
-    IPC_MESSAGE_HANDLER(ViewHostMsg_ToggleInspectElementMode,
-                        OnToggleInspectElementMode);
     IPC_MESSAGE_HANDLER(ViewHostMsg_DevToolsRuntimeFeatureStateChanged,
                         OnDevToolsRuntimeFeatureStateChanged);
     IPC_MESSAGE_HANDLER(ViewHostMsg_UserMetricsRecordAction,
@@ -1438,10 +1435,6 @@ void RenderViewHost::OnUndockDevToolsWindow() {
   DevToolsManager::GetInstance()->UndockWindow(this);
 }
 
-void RenderViewHost::OnToggleInspectElementMode(bool enabled) {
-  DevToolsManager::GetInstance()->ToggleInspectElementMode(this, enabled);
-}
-
 void RenderViewHost::OnDevToolsRuntimeFeatureStateChanged(
     const std::string& feature,
     bool enabled) {
@@ -1609,13 +1602,6 @@ gfx::Rect RenderViewHost::GetRootWindowResizerRect() const {
 
 void RenderViewHost::ForwardMouseEvent(
     const WebKit::WebMouseEvent& mouse_event) {
-  if (in_inspect_element_mode_ &&
-      mouse_event.type == WebInputEvent::MouseDown) {
-    in_inspect_element_mode_ = false;
-    DevToolsManager::GetInstance()->InspectElement(this, mouse_event.x,
-        mouse_event.y);
-    return;
-  }
 
   // We make a copy of the mouse event because
   // RenderWidgetHost::ForwardMouseEvent will delete |mouse_event|.
diff --git a/chrome/browser/renderer_host/render_view_host.h b/chrome/browser/renderer_host/render_view_host.h
index 7d9337f..2f52c05 100644
--- a/chrome/browser/renderer_host/render_view_host.h
+++ b/chrome/browser/renderer_host/render_view_host.h
@@ -437,10 +437,6 @@ class RenderViewHost : public RenderWidgetHost,
   // Tell renderer which browser window it is being attached to.
   void UpdateBrowserWindowId(int window_id);
 
-  void set_in_inspect_element_mode(bool enabled) {
-    in_inspect_element_mode_ = enabled;
-  }
-
  protected:
   // RenderWidgetHost protected overrides.
   virtual bool ShouldSendToRenderer(const NativeWebKeyboardEvent& event);
@@ -553,7 +549,6 @@ class RenderViewHost : public RenderWidgetHost,
   void OnCloseDevToolsWindow();
   void OnDockDevToolsWindow();
   void OnUndockDevToolsWindow();
-  void OnToggleInspectElementMode(bool enabled);
   void OnDevToolsRuntimeFeatureStateChanged(const std::string& feature,
                                             bool enabled);
 
@@ -659,11 +654,6 @@ class RenderViewHost : public RenderWidgetHost,
   // True if the render view can be shut down suddenly.
   bool sudden_termination_allowed_;
 
-  // DevTools triggers this mode when user chooses inspect lens tool.
-  // While in this mode, mouse click is converted into InspectElement
-  // command.
-  bool in_inspect_element_mode_;
-
   NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderViewHost);