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 392 matching lines @@
   ShowWithWindowState(ui::SHOW_STATE_MAXIMIZED);
 }
 
 void NativeWidgetAura::ShowWithWindowState(ui::WindowShowState state) {
   if (state == ui::SHOW_STATE_MAXIMIZED ||
       state == ui::SHOW_STATE_FULLSCREEN) {
     window_->SetIntProperty(aura::kShowStateKey, state);
   }
   window_->Show();
   if (can_activate_ && (state != ui::SHOW_STATE_INACTIVE ||
                         !GetWidget()->SetInitialFocus())) {

[oshima, 2011/12/06 19:30:37]

This looks wrong. Could be the cause of crbug.com/105195.
alice, can you look into this?

     window_->Activate();
   }
 }
 
 bool NativeWidgetAura::IsVisible() const {
   return window_->IsVisible();
 }
 
 void NativeWidgetAura::Activate() {
   window_->Activate();
@@ skipping 122 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.

[oshima, 2011/12/06 19:30:37]

please remove this as this is a copy from gtk and not applicable here.

[mazda, 2011/12/07 04:51:51]

Done.

-    // TODO(mazda): Investigate this is actually necessary.
-    // widget->GetFocusManager()->RestoreFocusedView();
+    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();
@@ skipping 199 matching lines @@
   NOTIMPLEMENTED();
 }
 
 // static
 bool NativeWidgetPrivate::IsMouseButtonDown() {
   return aura::Desktop::GetInstance()->IsMouseButtonDown();
 }
 
 }  // namespace internal
 }  // namespace views