Revise NativeWidgetWin focus hack; force focus on restore.

ui/views/widget/native_widget_win.cc

Index: ui/views/widget/native_widget_win.cc
diff --git a/ui/views/widget/native_widget_win.cc b/ui/views/widget/native_widget_win.cc
index eef25f8e7915514187f349ef1644fbdfe835edfc..86d723c76bd6f5d45d673b88c0ac3ebf87782712 100644
--- a/ui/views/widget/native_widget_win.cc
+++ b/ui/views/widget/native_widget_win.cc
@@ -502,16 +502,6 @@ void NativeWidgetWin::SaveFocusOnDeactivate() {
 }
 
 void NativeWidgetWin::RestoreFocusOnActivate() {
-  // Mysteriously, this only appears to be needed support restoration of focus
-  // to a child hwnd when restoring its top level window from the minimized
-  // state. If we don't do this, then ::SetFocus() to that child HWND returns
-  // ERROR_INVALID_PARAMETER, despite both HWNDs being of the same thread.
-  // See http://crbug.com/125976
-  {
-    // Since this is a synthetic reset, we don't need to tell anyone about it.
-    AutoNativeNotificationDisabler disabler;
-    GetWidget()->GetFocusManager()->ClearFocus();
-  }
   RestoreFocusOnEnable();
 }