Changing the focus manager to not subclass HWNDs (but for the top-windows).Components that have HWND now need to specifically let the FocusManager know when they get the native focus.This is the reason for the new GotFocus() notification on the RenderWidgetHostViewWin class.BUG=NoneTEST=Run the interactive tests, the unit-tests. Test that the focus is remembered correctly when switching windows, switching tabs. Test that focus traversal in the browser and in the option dialog works as expected.

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

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

2 files changed, 0 insertions, 9 deletions

diff --git a/views/controls/native/native_view_host_gtk.cc b/views/controls/native/native_view_host_gtk.cc
index 4b88067c..7f59144 100644
--- a/views/controls/native/native_view_host_gtk.cc
+++ b/views/controls/native/native_view_host_gtk.cc
@@ -71,8 +71,6 @@ void NativeViewHostGtk::NativeViewAttached() {
   host_->Layout();
 
   // TODO(port): figure out focus.
-  // FocusManager::InstallFocusSubclass(
-  // hwnd, associated_focus_view()_ ? associated_focus_view() : this);
 }
 
 void NativeViewHostGtk::NativeViewDetaching() {
diff --git a/views/controls/native/native_view_host_win.cc b/views/controls/native/native_view_host_win.cc
index 04c9edc..d1a5217 100644
--- a/views/controls/native/native_view_host_win.cc
+++ b/views/controls/native/native_view_host_win.cc
@@ -37,16 +37,9 @@ void NativeViewHostWin::NativeViewAttached() {
   // 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;
 }