Store and restore view focus in OnWindowFocused.

Mimic [Desktop]NativeWidgetAura::OnWindowActivated.
Simplify OnNativeBlur calls and OnNative[Blur|Focus] impls.
(View focus changes update the TextInputClient as needed)
Rewrite and enable related ConstrainedWindowViewTests.

Print GetLastError() in SendInput() error case for tests.
(key presses get 5/ERROR_ACCESS_DENIED on locked desktops?)

BUG=368691,170331,177482,163931
TEST=Automated tests; the focused Views change as expected between the browser, web contents, and web content modal dialogs (print preview, collected cookies, etc.).
R=sky@chromium.org

Review URL: https://codereview.chromium.org/282223002

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

ui/base/win/foreground_helper.cc

@@ -43,7 +43,7 @@ HRESULT ForegroundHelper::ForegroundHotKey(HWND window) {
   hotkey.type = INPUT_KEYBOARD;
   hotkey.ki.wVk =  VK_F22;
   if (1 != SendInput(1, &hotkey, sizeof(hotkey))) {
-    LOG(WARNING) << "Failed to send input";
+    LOG(WARNING) << "Failed to send input; GetLastError(): " << GetLastError();
     return E_FAIL;
   }
 

ui/views/widget/desktop_aura/desktop_native_widget_aura.cc

@@ -258,6 +258,7 @@ DesktopNativeWidgetAura::DesktopNativeWidgetAura(
       native_widget_delegate_(delegate),
       last_drop_operation_(ui::DragDropTypes::DRAG_NONE),
       restore_focus_on_activate_(false),
+      restore_focus_on_window_focus_(false),
       cursor_(gfx::kNullCursor),
       widget_type_(Widget::InitParams::TYPE_WINDOW) {
   aura::client::SetFocusChangeObserver(content_window_, this);
@@ -1082,15 +1083,23 @@ void DesktopNativeWidgetAura::OnWindowFocused(aura::Window* gained_focus,
     native_widget_delegate_->OnNativeFocus(lost_focus);
 
     // If focus is moving from a descendant Window to |content_window_| then
-    // native activation hasn't changed. We still need to inform the InputMethod
-    // we've been focused though.
+    // native activation hasn't changed. Still, the InputMethod and FocusManager
+    // must be informed of the Window focus change.
     InputMethod* input_method = GetWidget()->GetInputMethod();
     if (input_method)
       input_method->OnFocus();
+
+    if (restore_focus_on_window_focus_) {
+      restore_focus_on_window_focus_ = false;
+      GetWidget()->GetFocusManager()->RestoreFocusedView();
+    }
   } else if (content_window_ == lost_focus) {
     desktop_window_tree_host_->OnNativeWidgetBlur();
-    native_widget_delegate_->OnNativeBlur(
-        aura::client::GetFocusClient(content_window_)->GetFocusedWindow());
+    native_widget_delegate_->OnNativeBlur(gained_focus);
+
+    DCHECK(!restore_focus_on_window_focus_);
+    restore_focus_on_window_focus_ = true;
+    GetWidget()->GetFocusManager()->StoreFocusedView(false);
   }
 }
 

ui/views/widget/desktop_aura/desktop_native_widget_aura.h

@@ -294,6 +294,7 @@ class VIEWS_EXPORT DesktopNativeWidgetAura
       window_modality_controller_;
 
   bool restore_focus_on_activate_;
+  bool restore_focus_on_window_focus_;
 
   gfx::NativeCursor cursor_;
   // We must manually reference count the number of users of |cursor_manager_|

ui/views/widget/native_widget_aura.cc

@@ -895,6 +895,7 @@ void NativeWidgetAura::OnWindowFocused(aura::Window* gained_focus,
     if (GetWidget()->GetInputMethod())  // Null in tests.
       GetWidget()->GetInputMethod()->OnFocus();
     delegate_->OnNativeFocus(lost_focus);
+    GetWidget()->GetFocusManager()->RestoreFocusedView();
   } else if (window_ == lost_focus) {
     // GetInputMethod() recreates the input method if it's previously been
     // destroyed.  If we get called during destruction, the input method will be
@@ -910,9 +911,8 @@ void NativeWidgetAura::OnWindowFocused(aura::Window* gained_focus,
       DCHECK_EQ(ownership_, Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET);
     }
 
-    aura::client::FocusClient* client = aura::client::GetFocusClient(window_);
-    if (client)  // NULL during destruction of aura::Window.
-      delegate_->OnNativeBlur(client->GetFocusedWindow());
+    delegate_->OnNativeBlur(gained_focus);
+    GetWidget()->GetFocusManager()->StoreFocusedView(true);
   }
 }
 

ui/views/widget/widget.cc

@@ -1045,19 +1045,11 @@ void Widget::OnNativeWidgetActivationChanged(bool active) {
 }
 
 void Widget::OnNativeFocus(gfx::NativeView old_focused_view) {
-  // Ensure the focused view's TextInputClient is used for text input.
-  views::FocusManager* focus_manager = GetFocusManager();
-  focus_manager->FocusTextInputClient(focus_manager->GetFocusedView());
-
   WidgetFocusManager::GetInstance()->OnWidgetFocusEvent(old_focused_view,
                                                         GetNativeView());
 }
 
 void Widget::OnNativeBlur(gfx::NativeView new_focused_view) {
-  // Ensure the focused view's TextInputClient is not used for text input.
-  views::FocusManager* focus_manager = GetFocusManager();
-  focus_manager->BlurTextInputClient(focus_manager->GetFocusedView());
-
   WidgetFocusManager::GetInstance()->OnWidgetFocusEvent(GetNativeView(),
                                                         new_focused_view);
 }