Revise NativeWidgetWin focus hack; force focus on restore.

ui/views/widget/native_widget_win.cc

 // Copyright (c) 2012 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 "ui/views/widget/native_widget_win.h"
 
 #include <dwmapi.h>
 #include <shellapi.h>
 
 #include <algorithm>
@@ skipping 484 matching lines @@
 
 bool NativeWidgetWin::CanSaveFocus() const {
   return GetWidget()->is_top_level();
 }
 
 void NativeWidgetWin::SaveFocusOnDeactivate() {
   GetWidget()->GetFocusManager()->StoreFocusedView(true);
 }
 
 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();
 }
 
 void NativeWidgetWin::RestoreFocusOnEnable() {
   GetWidget()->GetFocusManager()->RestoreFocusedView();
 }
 
 bool NativeWidgetWin::IsModal() const {
   return delegate_->IsModal();
 }
@@ skipping 449 matching lines @@
 // static
 bool NativeWidgetPrivate::IsTouchDown() {
   // This currently isn't necessary because we're not generating touch events on
   // windows.  When we do, this will need to be updated.
   return false;
 }
 
 }  // namespace internal
 
 }  // namespace views