Get rid of last views dependency in RenderWidgetHostViewWin.

content/browser/renderer_host/render_widget_host_view_win.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Need Win 7 headers for WM_GESTURE and ChangeWindowMessageFilterEx
 // TODO(jschuh): See crbug.com/92941 for longterm fix.
 #undef  WINVER
 #define WINVER _WIN32_WINNT_WIN7
 #undef  _WIN32_WINNT
 #define _WIN32_WINNT _WIN32_WINNT_WIN7
@@ skipping 35 matching lines @@
 #include "ui/base/l10n/l10n_util_win.h"
 #include "ui/base/text/text_elider.h"
 #include "ui/base/view_prop.h"
 #include "ui/base/win/hwnd_util.h"
 #include "ui/base/win/mouse_wheel_util.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/canvas_skia.h"
 #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"
 #include "webkit/plugins/npapi/webplugin.h"
 #include "webkit/plugins/npapi/webplugin_delegate_impl.h"
 
 using base::TimeDelta;
 using base::TimeTicks;
 using ui::ViewProp;
 using WebKit::WebInputEvent;
@@ skipping 13 matching lines @@
 const int kMaxTooltipLength = 1024;
 
 // A custom MSAA object id used to determine if a screen reader is actively
 // listening for MSAA events.
 const int kIdCustom = 1;
 
 // The delay before the compositor host window is destroyed. This gives the GPU
 // 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) {
   const HWND toplevel_hwnd = reinterpret_cast<HWND>(arg);
 
   if (::IsWindowVisible(window)) {
     const HWND owner = ::GetWindow(window, GW_OWNER);
     if (toplevel_hwnd == owner) {
       ::PostMessage(window, WM_CANCELMODE, 0, 0);
     }
@@ skipping 409 matching lines @@
   // Popups should not be activated.
   return popup_type_ == WebKit::WebPopupTypeNone;
 }
 
 void RenderWidgetHostViewWin::Focus() {
   if (IsWindow())
     SetFocus();
 }
 
 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() {
   return ::GetFocus() == m_hWnd;
 }
 
 void RenderWidgetHostViewWin::Show() {
   if (!is_fullscreen_) {
     DCHECK(parent_hwnd_);
     DCHECK(parent_hwnd_ != GetDesktopWindow());
@@ skipping 262 matching lines @@
 ///////////////////////////////////////////////////////////////////////////////
 // RenderWidgetHostViewWin, private:
 
 LRESULT RenderWidgetHostViewWin::OnCreate(CREATESTRUCT* create_struct) {
   // Call the WM_INPUTLANGCHANGE message handler to initialize the input locale
   // of a browser process.
   OnInputLangChange(0, 0);
   // 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;
 }
 
 void RenderWidgetHostViewWin::OnActivate(UINT action, BOOL minimized,
                                          HWND window) {
   // If the container is a popup, clicking elsewhere on screen should close the
   // popup.
   if (close_on_deactivate_ && action == WA_INACTIVE) {
     // Send a windows message so that any derived classes
@@ skipping 185 matching lines @@
   return 1;
 }
 
 LRESULT RenderWidgetHostViewWin::OnSetCursor(HWND window, UINT hittest_code,
                                              UINT mouse_message_id) {
   UpdateCursorIfOverSelf();
   return 0;
 }
 
 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_)
     render_widget_host_->GotFocus();
 }
 
 void RenderWidgetHostViewWin::OnKillFocus(HWND window) {
-  views::FocusManager::GetWidgetFocusManager()->OnWidgetFocusEvent(m_hWnd,
-                                                                   window);
-
   if (render_widget_host_)
     render_widget_host_->Blur();
 }
 
 void RenderWidgetHostViewWin::OnCaptureChanged(HWND window) {
   if (render_widget_host_)
     render_widget_host_->LostCapture();
 }
 
 void RenderWidgetHostViewWin::OnCancelMode() {
@@ skipping 813 matching lines @@
                                                       DWORD ex_style) {
   parent_hwnd_ = parent_hwnd;
   Create(parent_hwnd_, NULL, NULL, WS_POPUP, ex_style);
   MoveWindow(pos.x(), pos.y(), pos.width(), pos.height(), TRUE);
   // To show tooltip on popup window.(e.g. title in <select>)
   // Popups default to showing, which means |DidBecomeSelected()| isn't invoked.
   // Ensure the tooltip is created otherwise tooltips are never shown.
   EnsureTooltip();
   ShowWindow(IsActivatable() ? SW_SHOW : SW_SHOWNA);
 }