Ensure that the AURA focused window is set correctly when the window is activated.

ui/views/widget/desktop_aura/desktop_native_widget_aura.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/desktop_aura/desktop_native_widget_aura.h"
 
 #include "base/bind.h"
 #include "ui/aura/client/activation_client.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/cursor_client.h"
@@ skipping 211 matching lines @@
       new corewm::InputMethodEventFilter(root->GetAcceleratedWidget()));
   input_method_event_filter_->SetInputMethodPropertyInRootWindow(root);
   root_window_event_filter_->AddHandler(input_method_event_filter_.get());
 }
 
 void DesktopNativeWidgetAura::CreateCaptureClient(aura::RootWindow* root) {
   DCHECK(!capture_client_.get());
   capture_client_.reset(new corewm::ScopedCaptureClient(root));
 }
 
+void DesktopNativeWidgetAura::HandleActivationChanged(bool active) {
+  native_widget_delegate_->OnNativeWidgetActivationChanged(active);
+  aura::client::ActivationClient* activation_client =
+      aura::client::GetActivationClient(root_window_.get());
+  if (!activation_client)
+    return;
+  if (active) {
+    if (GetWidget()->HasFocusManager()) {
+      // This function can be called before the focus manager has had a
+      // chance to set the focused view. In which case we should get the
+      // last focused view.
+      View* view_for_activation =
+          GetWidget()->GetFocusManager()->GetFocusedView() ?
+              GetWidget()->GetFocusManager()->GetFocusedView() :
+                  GetWidget()->GetFocusManager()->GetStoredFocusView();
+      if (!view_for_activation)
+        view_for_activation = GetWidget()->GetRootView();
+      activation_client->ActivateWindow(
+          view_for_activation->GetWidget()->GetNativeView());
+    }
+  } else {
+    // If we're not active we need to deactivate the corresponding
+    // aura::Window. This way if a child widget is active it gets correctly
+    // deactivated (child widgets don't get native desktop activation changes,
+    // only aura activation changes).
+    aura::Window* active_window = activation_client->GetActiveWindow();
+    if (active_window)
+      activation_client->DeactivateWindow(active_window);
+  }
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // DesktopNativeWidgetAura, internal::NativeWidgetPrivate implementation:
 
 void DesktopNativeWidgetAura::InitNativeWidget(
     const Widget::InitParams& params) {
   ownership_ = params.ownership;
 
   NativeWidgetAura::RegisterNativeWidgetForWindow(this, window_);
   // Animations on TYPE_WINDOW are handled by the OS. Additionally if we animate
   // these windows the size of the window gets augmented, effecting restore
@@ skipping 688 matching lines @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // DesktopNativeWidgetAura, NativeWidget implementation:
 
 ui::EventHandler* DesktopNativeWidgetAura::GetEventHandler() {
   return this;
 }
 
 }  // namespace views