Get rid of last views dependency in RenderWidgetHostViewWin.

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

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

5 files changed, 9 insertions, 22 deletions

diff --git a/content/browser/DEPS b/content/browser/DEPS
index 7fec844..10db8fb 100644
--- a/content/browser/DEPS
+++ b/content/browser/DEPS
@@ -5,6 +5,11 @@ include_rules = [
   # See https://sites.google.com/a/chromium.org/dev/developers/content-module
   # for more information.
 
+  # Content shouldn't depend on views. This rule is now in content\browser,
+  # instead of content, because there's one file in content\common that depends
+  # on views. When it's moved back to chrome, move this rule up.
+  "-views",
+
   # ONLY USED BY TESTS
 	"+chrome/browser/browser_process.h",
   "+chrome/browser/ui/browser.h",
diff --git a/content/browser/renderer_host/render_widget_host_view_gtk.cc b/content/browser/renderer_host/render_widget_host_view_gtk.cc
index 4f87812..4c535f63 100644
--- a/content/browser/renderer_host/render_widget_host_view_gtk.cc
+++ b/content/browser/renderer_host/render_widget_host_view_gtk.cc
@@ -54,7 +54,6 @@ namespace {
 
 const int kMaxWindowWidth = 4000;
 const int kMaxWindowHeight = 4000;
-const char* kRenderWidgetHostViewKey = "__RENDER_WIDGET_HOST_VIEW__";
 
 // The duration of the fade-out animation. See |overlay_animation_|.
 const int kFadeEffectDuration = 300;
@@ -157,9 +156,6 @@ class RenderWidgetHostViewGtkWidget {
     g_signal_connect_after(widget, "scroll-event",
                            G_CALLBACK(OnMouseScrollEvent), host_view);
 
-    g_object_set_data(G_OBJECT(widget), kRenderWidgetHostViewKey,
-                      static_cast<RenderWidgetHostView*>(host_view));
-
     return widget;
   }
 
diff --git a/content/browser/renderer_host/render_widget_host_view_win.cc b/content/browser/renderer_host/render_widget_host_view_win.cc
index 9f1d7d4..f87c1aa 100644
--- a/content/browser/renderer_host/render_widget_host_view_win.cc
+++ b/content/browser/renderer_host/render_widget_host_view_win.cc
@@ -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 @@ const int kIdCustom = 1;
 // process a grace period to stop referencing it.
 const int kDestroyCompositorHostWindowDelay = 10000;
 
-const char* const kRenderWidgetHostViewKey = "__RENDER_WIDGET_HOST_VIEW__";
-
 // 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::Focus() {
 }
 
 void RenderWidgetHostViewWin::Blur() {
-  views::Widget* widget = views::Widget::GetTopLevelWidgetForNativeView(m_hWnd);
-  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 @@ LRESULT RenderWidgetHostViewWin::OnCreate(CREATESTRUCT* create_struct) {
   // 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 @@ LRESULT RenderWidgetHostViewWin::OnSetCursor(HWND window, UINT hittest_code,
 }
 
 void RenderWidgetHostViewWin::OnSetFocus(HWND window) {
-  views::FocusManager::GetWidgetFocusManager()->OnWidgetFocusEvent(window,
-                                                                   m_hWnd);
   if (browser_accessibility_manager_.get())
     browser_accessibility_manager_->GotFocus();
   if (render_widget_host_)
@@ -1024,9 +1010,6 @@ void RenderWidgetHostViewWin::OnSetFocus(HWND window) {
 }
 
 void RenderWidgetHostViewWin::OnKillFocus(HWND window) {
-  views::FocusManager::GetWidgetFocusManager()->OnWidgetFocusEvent(m_hWnd,
-                                                                   window);
-
   if (render_widget_host_)
     render_widget_host_->Blur();
 }
diff --git a/content/content_common.gypi b/content/content_common.gypi
index 3e067c1..d974d29 100644
--- a/content/content_common.gypi
+++ b/content/content_common.gypi
@@ -60,6 +60,7 @@
         'common/common_param_traits.h',
         'common/content_message_generator.cc',
         'common/content_message_generator.h',
+        'common/content_notification_types.h',
         'common/content_export.h',
         'common/content_client.cc',
         'common/content_client.h',
diff --git a/views/widget/native_widget_win.cc b/views/widget/native_widget_win.cc
index 495e03a..8be88ba 100644
--- a/views/widget/native_widget_win.cc
+++ b/views/widget/native_widget_win.cc
@@ -926,6 +926,8 @@ void NativeWidgetWin::Maximize() {
 
 void NativeWidgetWin::Minimize() {
   ExecuteSystemMenuCommand(SC_MINIMIZE);
+
+  delegate_->OnNativeBlur(NULL);
 }
 
 bool NativeWidgetWin::IsMaximized() const {