Reland r113741: Move {Restore,Store}FocusedView to NativeWidgetAura::On{Activated,LostActive}

ui/views/widget/native_widget_aura.cc

 // Copyright (c) 2011 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_aura.h"
 
 #include "base/bind.h"
 #include "base/string_util.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/drag_drop_client.h"
@@ skipping 549 matching lines @@
     GetWidget()->widget_delegate()->OnWidgetMove();
   if (old_bounds.size() != new_bounds.size())
     delegate_->OnNativeWidgetSizeChanged(new_bounds.size());
 }
 
 void NativeWidgetAura::OnFocus() {
   Widget* widget = GetWidget();
   if (widget->is_top_level()) {
     InputMethod* input_method = widget->GetInputMethod();
     input_method->OnFocus();
-    // See description of got_initial_focus_in_ for details on this.
-    // TODO(mazda): Investigate this is actually necessary.
-    // widget->GetFocusManager()->RestoreFocusedView();
   }
   delegate_->OnNativeFocus(window_);
 }
 
 void NativeWidgetAura::OnBlur() {
   Widget* widget = GetWidget();
   if (widget->is_top_level()) {
     InputMethod* input_method = widget->GetInputMethod();
     input_method->OnBlur();
-    widget->GetFocusManager()->StoreFocusedView();
   }
   delegate_->OnNativeBlur(NULL);
 }
 
 bool NativeWidgetAura::OnKeyEvent(aura::KeyEvent* event) {
   // TODO(beng): Need an InputMethodAura to properly handle character events.
   //             Right now, we just skip these.
   if (event->is_char())
     return false;
 
@@ skipping 34 matching lines @@
 
 bool NativeWidgetAura::CanFocus() {
   return true;
 }
 
 bool NativeWidgetAura::ShouldActivate(aura::Event* event) {
   return can_activate_;
 }
 
 void NativeWidgetAura::OnActivated() {
+  GetWidget()->GetFocusManager()->RestoreFocusedView();
   delegate_->OnNativeWidgetActivationChanged(true);
   if (IsVisible() && GetWidget()->non_client_view())
     GetWidget()->non_client_view()->SchedulePaint();
 }
 
 void NativeWidgetAura::OnLostActive() {
+  GetWidget()->GetFocusManager()->StoreFocusedView();
   delegate_->OnNativeWidgetActivationChanged(false);
   if (IsVisible() && GetWidget()->non_client_view())
     GetWidget()->non_client_view()->SchedulePaint();
 }
 
 void NativeWidgetAura::OnCaptureLost() {
   delegate_->OnMouseCaptureLost();
 }
 
 void NativeWidgetAura::OnPaint(gfx::Canvas* canvas) {
@@ skipping 149 matching lines @@
   }
 }
 
 // static
 bool NativeWidgetPrivate::IsMouseButtonDown() {
   return aura::RootWindow::GetInstance()->IsMouseButtonDown();
 }
 
 }  // namespace internal
 }  // namespace views