Get rid of last views dependency in RenderWidgetHostViewWin.

content/browser/renderer_host/render_widget_host_view_win.cc

Index: content/browser/renderer_host/render_widget_host_view_win.cc
===================================================================
--- content/browser/renderer_host/render_widget_host_view_win.cc	(revision 98490)
+++ content/browser/renderer_host/render_widget_host_view_win.cc	(working copy)
@@ -53,8 +53,6 @@
 #include "ui/gfx/gdi_util.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/screen.h"
-#include "views/focus/focus_manager.h"
-#include "views/widget/widget.h"
 #include "webkit/glue/webaccessibility.h"
 #include "webkit/glue/webcursor.h"
 #include "webkit/plugins/npapi/plugin_constants_win.h"
@@ -88,8 +86,6 @@
 // process a grace period to stop referencing it.
 const int kDestroyCompositorHostWindowDelay = 10000;
 
-const char* const kRenderWidgetHostViewKey = "__RENDER_WIDGET_HOST_VIEW__";

[jam, 2011/08/26 22:23:37]

this is also code from r38685 that's not being used anymore (also line 811)

-
 // A callback function for EnumThreadWindows to enumerate and dismiss
 // any owned popop windows
 BOOL CALLBACK DismissOwnedPopups(HWND window, LPARAM arg) {
@@ -519,13 +515,7 @@
 }
 
 void RenderWidgetHostViewWin::Blur() {
-  views::Widget* widget = views::Widget::GetTopLevelWidgetForNativeView(m_hWnd);

[jam, 2011/08/26 22:23:37]

I couldn't find any place that called this code, and testing verified that it's
not reachable.

-  if (widget) {
-    views::FocusManager* focus_manager = widget->GetFocusManager();
-    // We don't have a FocusManager if we are hidden.
-    if (focus_manager)
-      focus_manager->ClearFocus();
-  }
+  NOTREACHED();
 }
 
 bool RenderWidgetHostViewWin::HasFocus() {
@@ -808,8 +798,6 @@
   // Marks that window as supporting mouse-wheel messages rerouting so it is
   // scrolled when under the mouse pointer even if inactive.
   props_.push_back(ui::SetWindowSupportsRerouteMouseWheel(m_hWnd));
-  props_.push_back(new ViewProp(m_hWnd, kRenderWidgetHostViewKey,
-                                static_cast<RenderWidgetHostView*>(this)));
 
   return 0;
 }
@@ -1015,8 +1003,6 @@
 }
 
 void RenderWidgetHostViewWin::OnSetFocus(HWND window) {
-  views::FocusManager::GetWidgetFocusManager()->OnWidgetFocusEvent(window,

[jam, 2011/08/26 22:23:37]

this code, and below, were added in r49884 so that extensions can know when the
browser window lost focus to another application.

this particular call isn't actually the ones that does this, it's the one below
in 1027.

that call is redundant when switching between Chrome and another application by
clicking on the other application (the FocusManager listeners get called twice),
since NativeWidgetWin::OnSetFocus gets called in that case. The one case that
wasn't handled, where this code was needed, was when pressing the minimize
button. I've done that in NativeWidgetWin::Minimize().

-                                                                   m_hWnd);
   if (browser_accessibility_manager_.get())
     browser_accessibility_manager_->GotFocus();
   if (render_widget_host_)
@@ -1024,9 +1010,6 @@
 }
 
 void RenderWidgetHostViewWin::OnKillFocus(HWND window) {
-  views::FocusManager::GetWidgetFocusManager()->OnWidgetFocusEvent(m_hWnd,
-                                                                   window);
-
   if (render_widget_host_)
     render_widget_host_->Blur();
 }