Moving the Windows specific activation code in the FocusManager to the widget_win.

BUG=None
TEST=Test that the focus in the browser works well: that windows remember which view had focus when deactivated/reactivated. Make sure focus traversal works as expected.
Review URL: http://codereview.chromium.org/118406

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

1 files changed, 19 insertions, 0 deletions

diff --git a/views/widget/widget_win.cc b/views/widget/widget_win.cc
index 353fcbc..41c7309 100644
--- a/views/widget/widget_win.cc
+++ b/views/widget/widget_win.cc
@@ -1046,7 +1046,26 @@ LRESULT CALLBACK WidgetWin::WndProc(HWND window, UINT message,
     widget->hwnd_ = NULL;
     widget->OnFinalMessage(window);
   }
+  if (message == WM_ACTIVATE)
+    PostProcessActivateMessage(widget, LOWORD(w_param));
   return result;
 }
 
+// static
+void WidgetWin::PostProcessActivateMessage(WidgetWin* widget,
+                                           int activation_state) {
+  FocusManager* focus_manager =
+      FocusManager::GetFocusManager(widget->GetNativeView());
+  if (!focus_manager) {
+    NOTREACHED();
+    return;
+  }
+  if (WA_INACTIVE == activation_state) {
+    focus_manager->StoreFocusedView();
+  } else {
+    // We must restore the focus after the message has been DefProc'ed as it
+    // does set the focus to the last focused HWND.
+    focus_manager->RestoreFocusedView();
+  }
+}
 }  // namespace views