Revert 177209 - Enable the FocusController on DesktopAura too.

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/stacking_client.h"
 #include "ui/aura/focus_manager.h"
 #include "ui/aura/root_window.h"
@@ skipping 610 matching lines @@
                                                 aura::Window* lost_active) {
   DCHECK(window_ == gained_active || window_ == lost_active);
   if ((window_ == gained_active || window_ == lost_active) &&
       IsVisible() && GetWidget()->non_client_view()) {
     GetWidget()->non_client_view()->SchedulePaint();
   }
   if (gained_active == window_ && restore_focus_on_activate_) {
     restore_focus_on_activate_ = false;
     GetWidget()->GetFocusManager()->RestoreFocusedView();
   } else if (lost_active == window_ && GetWidget()->HasFocusManager()) {
-    DCHECK(!restore_focus_on_activate_);
-    restore_focus_on_activate_ = true;
-    // Pass in false so that ClearNativeFocus() isn't invoked.
-    GetWidget()->GetFocusManager()->StoreFocusedView(false);
+    // If we're losing focus to a window that is a top level (such as a bubble)
+    // store the focus. Such a window shares the same RootWindowHost, so that
+    // such a change won't trigger an activation change (which calls
+    // StoreFocusedView()). Without this the focused view is never told it lost
+    // focus.
+    aura::Window* focused_window =
+        aura::client::GetFocusClient(window_)->GetFocusedWindow();
+    if (focused_window && focused_window != window_) {
+      Widget* focused_widget = Widget::GetWidgetForNativeWindow(focused_window);
+      if (focused_widget && focused_widget != GetWidget() &&
+          focused_widget->is_top_level()) {
+        DCHECK(!restore_focus_on_activate_);
+        restore_focus_on_activate_ = true;
+        // Pass in false so that ClearNativeFocus() isn't invoked.
+        GetWidget()->GetFocusManager()->StoreFocusedView(false);
+      }
+    }
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // DesktopNativeWidgetAura, aura::client::FocusChangeObserver implementation:
 
 void DesktopNativeWidgetAura::OnWindowFocused(aura::Window* gained_focus,
                                               aura::Window* lost_focus) {
   if (window_ == gained_focus) {
     desktop_root_window_host_->OnNativeWidgetFocus();
@@ skipping 45 matching lines @@
   drop_helper_->OnDragExit();
 }
 
 int DesktopNativeWidgetAura::OnPerformDrop(const ui::DropTargetEvent& event) {
   DCHECK(drop_helper_.get() != NULL);
   return drop_helper_->OnDrop(event.data(), event.location(),
       last_drop_operation_);
 }
 
 }  // namespace views