Enable the FocusController on DesktopAura too.

http://crbug.com/162100
R=sky@chromium.org
Review URL: https://codereview.chromium.org/11885030

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@177209 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 89 insertions, 26 deletions

diff --git a/ui/views/views.gyp b/ui/views/views.gyp
index 8a100fd..1614468 100644
--- a/ui/views/views.gyp
+++ b/ui/views/views.gyp
@@ -357,6 +357,8 @@
         'widget/desktop_aura/desktop_drag_drop_client_win.h',
         'widget/desktop_aura/desktop_drop_target_win.cc',
         'widget/desktop_aura/desktop_drop_target_win.h',
+        'widget/desktop_aura/desktop_focus_rules.cc',
+        'widget/desktop_aura/desktop_focus_rules.h',
         'widget/desktop_aura/desktop_layout_manager.cc',
         'widget/desktop_aura/desktop_layout_manager.h',
         'widget/desktop_aura/desktop_native_widget_aura.cc',
diff --git a/ui/views/widget/desktop_aura/desktop_focus_rules.cc b/ui/views/widget/desktop_aura/desktop_focus_rules.cc
new file mode 100644
index 0000000..54894f8
--- /dev/null
+++ b/ui/views/widget/desktop_aura/desktop_focus_rules.cc
@@ -0,0 +1,20 @@
+// 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_focus_rules.h"
+
+#include "ui/aura/root_window.h"
+#include "ui/aura/window.h"
+
+namespace views {
+
+DesktopFocusRules::DesktopFocusRules() {}
+DesktopFocusRules::~DesktopFocusRules() {}
+
+bool DesktopFocusRules::SupportsChildActivation(aura::Window* window) const {
+  // In Desktop-Aura, only children of the RootWindow are activatable.
+  return window->GetRootWindow() == window;
+}
+
+}  // namespace views
diff --git a/ui/views/widget/desktop_aura/desktop_focus_rules.h b/ui/views/widget/desktop_aura/desktop_focus_rules.h
new file mode 100644
index 0000000..a7db8c2
--- /dev/null
+++ b/ui/views/widget/desktop_aura/desktop_focus_rules.h
@@ -0,0 +1,26 @@
+// 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.
+
+#ifndef UI_VIEWS_WIDGET_DESKTOP_FOCUS_RULES_H_
+#define UI_VIEWS_WIDGET_DESKTOP_FOCUS_RULES_H_
+
+#include "ui/views/corewm/base_focus_rules.h"
+
+namespace views {
+
+class DesktopFocusRules : public corewm::BaseFocusRules {
+ public:
+  DesktopFocusRules();
+  virtual ~DesktopFocusRules();
+
+ private:
+  // Overridden from corewm::BaseFocusRules:
+  virtual bool SupportsChildActivation(aura::Window* window) const OVERRIDE;
+
+  DISALLOW_COPY_AND_ASSIGN(DesktopFocusRules);
+};
+
+}  // namespace views
+
+#endif  // UI_VIEWS_WIDGET_DESKTOP_FOCUS_RULES_H_
diff --git a/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc b/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc
index 953fac6..c3a2c2b 100644
--- a/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc
+++ b/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc
@@ -628,23 +628,10 @@ void DesktopNativeWidgetAura::OnWindowActivated(aura::Window* gained_active,
     restore_focus_on_activate_ = false;
     GetWidget()->GetFocusManager()->RestoreFocusedView();
   } else if (lost_active == window_ && GetWidget()->HasFocusManager()) {
-    // 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);
-      }
-    }
+    DCHECK(!restore_focus_on_activate_);
+    restore_focus_on_activate_ = true;
+    // Pass in false so that ClearNativeFocus() isn't invoked.
+    GetWidget()->GetFocusManager()->StoreFocusedView(false);
   }
 }
 
diff --git a/ui/views/widget/desktop_aura/desktop_root_window_host_linux.cc b/ui/views/widget/desktop_aura/desktop_root_window_host_linux.cc
index e487e47..d54a317a 100644
--- a/ui/views/widget/desktop_aura/desktop_root_window_host_linux.cc
+++ b/ui/views/widget/desktop_aura/desktop_root_window_host_linux.cc
@@ -23,10 +23,13 @@
 #include "ui/base/x/x11_util.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/views/corewm/compound_event_filter.h"
+#include "ui/views/corewm/corewm_switches.h"
+#include "ui/views/corewm/focus_controller.h"
 #include "ui/views/ime/input_method.h"
 #include "ui/views/widget/desktop_aura/desktop_activation_client.h"
 #include "ui/views/widget/desktop_aura/desktop_cursor_client.h"
 #include "ui/views/widget/desktop_aura/desktop_dispatcher_client.h"
+#include "ui/views/widget/desktop_aura/desktop_focus_rules.h"
 #include "ui/views/widget/desktop_aura/desktop_layout_manager.h"
 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
 #include "ui/views/widget/desktop_aura/desktop_screen_position_client.h"
@@ -91,6 +94,10 @@ DesktopRootWindowHostLinux::DesktopRootWindowHostLinux(
 
 DesktopRootWindowHostLinux::~DesktopRootWindowHostLinux() {
   root_window_->ClearProperty(kHostForRootWindow);
+  if (corewm::UseFocusController()) {
+    aura::client::SetFocusClient(root_window_, NULL);
+    aura::client::SetActivationClient(root_window_, NULL);
+  }
 }
 
 // static
@@ -214,10 +221,17 @@ aura::RootWindow* DesktopRootWindowHostLinux::InitRootWindow(
   // messages to us.
   X11DesktopHandler::get();
 
-  focus_client_.reset(new aura::FocusManager);
-  aura::client::SetFocusClient(root_window_, focus_client_.get());
-
-  activation_client_.reset(new DesktopActivationClient(root_window_));
+  if (corewm::UseFocusController()) {
+    corewm::FocusController* focus_controller =
+        new corewm::FocusController(new DesktopFocusRules);
+    focus_client_.reset(focus_controller);
+    aura::client::SetFocusClient(root_window_, focus_controller);
+    aura::client::SetActivationClient(root_window_, focus_controller);
+  } else {
+    focus_client_.reset(new aura::FocusManager);
+    aura::client::SetFocusClient(root_window_, focus_client_.get());
+    activation_client_.reset(new DesktopActivationClient(root_window_));
+  }
 
   dispatcher_client_.reset(new DesktopDispatcherClient);
   aura::client::SetDispatcherClient(root_window_,
diff --git a/ui/views/widget/desktop_aura/desktop_root_window_host_win.cc b/ui/views/widget/desktop_aura/desktop_root_window_host_win.cc
index ce7ee03..c284ca3 100644
--- a/ui/views/widget/desktop_aura/desktop_root_window_host_win.cc
+++ b/ui/views/widget/desktop_aura/desktop_root_window_host_win.cc
@@ -19,12 +19,15 @@
 #include "ui/native_theme/native_theme_aura.h"
 #include "ui/native_theme/native_theme_win.h"
 #include "ui/views/corewm/compound_event_filter.h"
+#include "ui/views/corewm/corewm_switches.h"
+#include "ui/views/corewm/focus_controller.h"
 #include "ui/views/corewm/input_method_event_filter.h"
 #include "ui/views/ime/input_method_bridge.h"
 #include "ui/views/widget/desktop_aura/desktop_activation_client.h"
 #include "ui/views/widget/desktop_aura/desktop_cursor_client.h"
 #include "ui/views/widget/desktop_aura/desktop_dispatcher_client.h"
 #include "ui/views/widget/desktop_aura/desktop_drag_drop_client_win.h"
+#include "ui/views/widget/desktop_aura/desktop_focus_rules.h"
 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
 #include "ui/views/widget/desktop_aura/desktop_screen_position_client.h"
 #include "ui/views/widget/root_view.h"
@@ -54,6 +57,10 @@ DesktopRootWindowHostWin::DesktopRootWindowHostWin(
 }
 
 DesktopRootWindowHostWin::~DesktopRootWindowHostWin() {
+  if (corewm::UseFocusController()) {
+    aura::client::SetFocusClient(root_window_, NULL);
+    aura::client::SetActivationClient(root_window_, NULL);
+  }
 }
 
 // static
@@ -118,10 +125,17 @@ aura::RootWindow* DesktopRootWindowHostWin::Init(
   capture_client_.reset(new aura::client::DefaultCaptureClient(root_window_));
   aura::client::SetCaptureClient(root_window_, capture_client_.get());
 
-  focus_client_.reset(new aura::FocusManager);
-  aura::client::SetFocusClient(root_window_, focus_client_.get());
-
-  activation_client_.reset(new DesktopActivationClient(root_window_));
+  if (corewm::UseFocusController()) {
+    corewm::FocusController* focus_controller =
+        new corewm::FocusController(new DesktopFocusRules);
+    focus_client_.reset(focus_controller);
+    aura::client::SetFocusClient(root_window_, focus_controller);
+    aura::client::SetActivationClient(root_window_, focus_controller);
+  } else {
+    focus_client_.reset(new aura::FocusManager);
+    aura::client::SetFocusClient(root_window_, focus_client_.get());
+    activation_client_.reset(new DesktopActivationClient(root_window_));
+  }
 
   dispatcher_client_.reset(new DesktopDispatcherClient);
   aura::client::SetDispatcherClient(root_window_,
diff --git a/ui/views/widget/widget_unittest.cc b/ui/views/widget/widget_unittest.cc
index c23fd0f..524e0b7 100644
--- a/ui/views/widget/widget_unittest.cc
+++ b/ui/views/widget/widget_unittest.cc
@@ -1161,7 +1161,7 @@ TEST_F(WidgetTest, FocusChangesOnBubble) {
   contents_view->RequestFocus();
   EXPECT_TRUE(contents_view->HasFocus());
 
-  // Show a buble.
+  // Show a bubble.
   BubbleDelegateView* bubble_delegate_view =
       new BubbleDelegateView(contents_view, BubbleBorder::TOP_LEFT);
   bubble_delegate_view->set_focusable(true);