Moving the WM_SETFOCUS message processing out of FocusManager

views/controls/native/native_view_host_win.cc

 // Copyright (c) 2006-2008 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.
 
 #include "views/controls/native/native_view_host_win.h"
 
 #include "app/gfx/canvas.h"
 #include "base/logging.h"
 #include "views/controls/native/native_view_host.h"
 #include "views/focus/focus_manager.h"
@@ skipping 19 matching lines @@
   DCHECK(host_->native_view())
       << "Impossible detatched tab case; See crbug.com/6316";
 
   // First hide the new window. We don't want anything to draw (like sub-hwnd
   // borders), when we change the parent below.
   ShowWindow(host_->native_view(), SW_HIDE);
 
   // Need to set the HWND's parent before changing its size to avoid flashing.
   SetParent(host_->native_view(), host_->GetWidget()->GetNativeView());
   host_->Layout();
-
-  // Register with the focus manager so the associated view is focused when the
-  // native control gets the focus.
-  View* focus_view = host_->focus_view() ? host_->focus_view() : host_;
-  FocusManager::InstallFocusSubclass(host_->native_view(), focus_view);
 }
 
 void NativeViewHostWin::NativeViewDetaching() {
-  DCHECK(host_->native_view());
-  FocusManager::UninstallFocusSubclass(host_->native_view());
   installed_clip_ = false;
 }
 
 void NativeViewHostWin::AddedToWidget() {
   if (!IsWindow(host_->native_view()))
     return;
   HWND parent_hwnd = GetParent(host_->native_view());
   HWND widget_hwnd = host_->GetWidget()->GetNativeView();
   if (parent_hwnd != widget_hwnd)
     SetParent(host_->native_view(), widget_hwnd);
@@ skipping 70 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // NativeViewHostWrapper, public:
 
 // static
 NativeViewHostWrapper* NativeViewHostWrapper::CreateWrapper(
     NativeViewHost* host) {
   return new NativeViewHostWin(host);
 }
 
 }  // namespace views