Move DefaultActivationClient to wm/core

Several tests are using AuraTestHelper and were relying on it to set up the DefaultActivationClient, so I had to have them instantiate the DAC directly after calling SetUp() on the helper. I also had to make the DAC delete itself after the root window it's bound to is destroyed. R=sky@chromium.org http://crbug.com/308710 Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=266616 Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=266975 Review URL: https://codereview.chromium.org/250113002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@267065 0039d316-1c4b-4281-b951-d872f2087c98
FairyWorld · Apr 30, 2014 · f3b1efd · f3b1efd
1 parent 946cdb6
commit f3b1efd
Show file tree

Hide file tree

Showing 33 changed files with 177 additions and 121 deletions.
diff --git a/chrome/browser/ui/views/accessibility/accessibility_event_router_views_unittest.cc b/chrome/browser/ui/views/accessibility/accessibility_event_router_views_unittest.cc
@@ -35,6 +35,7 @@
 #include "ui/aura/test/aura_test_helper.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/compositor/test/context_factories_for_test.h"
+#include "ui/wm/core/default_activation_client.h"
 #endif
 
 using base::ASCIIToUTF16;
@@ -113,6 +114,7 @@ class AccessibilityEventRouterViewsTest
 
     aura_test_helper_.reset(new aura::test::AuraTestHelper(&message_loop_));
     aura_test_helper_->SetUp();
+    new wm::DefaultActivationClient(aura_test_helper_->root_window());
 #endif  // USE_AURA
     EnableAccessibilityAndListenToFocusNotifications();
   }

diff --git a/chrome/browser/ui/views/apps/shaped_app_window_targeter_unittest.cc b/chrome/browser/ui/views/apps/shaped_app_window_targeter_unittest.cc
@@ -10,6 +10,7 @@
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/views/controls/webview/webview.h"
+#include "ui/wm/core/default_activation_client.h"
 #include "ui/wm/core/easy_resize_window_targeter.h"
 
 class ShapedAppWindowTargeterTest : public aura::test::AuraTestBase {
@@ -28,6 +29,7 @@ class ShapedAppWindowTargeterTest : public aura::test::AuraTestBase {
  protected:
   virtual void SetUp() OVERRIDE {
     aura::test::AuraTestBase::SetUp();
+    new wm::DefaultActivationClient(root_window());
     widget_.reset(new views::Widget);
     views::Widget::InitParams params(views::Widget::InitParams::TYPE_WINDOW);
     params.remove_standard_frame = true;

diff --git a/chrome/test/base/browser_with_test_window_test.cc b/chrome/test/base/browser_with_test_window_test.cc
@@ -20,6 +20,7 @@
 #if defined(USE_AURA)
 #include "ui/aura/test/aura_test_helper.h"
 #include "ui/compositor/test/context_factories_for_test.h"
+#include "ui/wm/core/default_activation_client.h"
 #endif
 
 #if defined(USE_ASH)
@@ -70,6 +71,7 @@ void BrowserWithTestWindowTest::SetUp() {
   aura_test_helper_.reset(new aura::test::AuraTestHelper(
       base::MessageLoopForUI::current()));
   aura_test_helper_->SetUp();
+  new wm::DefaultActivationClient(aura_test_helper_->root_window());
 #endif  // USE_AURA
 #if defined(TOOLKIT_VIEWS)
   views_delegate_.reset(CreateViewsDelegate());

diff --git a/chrome/test/base/view_event_test_base.cc b/chrome/test/base/view_event_test_base.cc
@@ -24,6 +24,7 @@
 #include "ui/message_center/message_center.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
+#include "ui/wm/core/default_activation_client.h"
 #include "ui/wm/core/wm_state.h"
 
 #if defined(USE_ASH)
@@ -140,6 +141,7 @@ void ViewEventTestBase::SetUp() {
   aura_test_helper_.reset(
       new aura::test::AuraTestHelper(base::MessageLoopForUI::current()));
   aura_test_helper_->SetUp();
+  new wm::DefaultActivationClient(aura_test_helper_->root_window());
   context = aura_test_helper_->root_window();
 #endif  // !USE_ASH && USE_AURA
 

diff --git a/content/DEPS b/content/DEPS
@@ -91,7 +91,7 @@ include_rules = [
   "+ui/shell_dialogs",
   "+ui/snapshot",
   "+ui/surface",
-  "+ui/wm/public",
+  "+ui/wm",
   # Content knows about grd files, but the specifics of how to get a resource
   # given its id is left to the embedder.
   "-ui/base/l10n",

diff --git a/content/browser/media/capture/desktop_capture_device_aura_unittest.cc b/content/browser/media/capture/desktop_capture_device_aura_unittest.cc
@@ -15,6 +15,7 @@
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/window.h"
 #include "ui/compositor/test/context_factories_for_test.h"
+#include "ui/wm/core/default_activation_client.h"
 
 using ::testing::_;
 using ::testing::AnyNumber;
@@ -65,6 +66,7 @@ class DesktopCaptureDeviceAuraTest : public testing::Test {
     ui::InitializeContextFactoryForTests(enable_pixel_output);
     helper_.reset(new aura::test::AuraTestHelper(&message_loop_));
     helper_->SetUp();
+    new wm::DefaultActivationClient(helper_->root_window());
 
     // We need a window to cover desktop area so that DesktopCaptureDeviceAura
     // can use gfx::NativeWindow::GetWindowAtScreenPoint() to locate the

diff --git a/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc b/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc
@@ -47,6 +47,7 @@
 #include "ui/compositor/test/in_process_context_factory.h"
 #include "ui/events/event.h"
 #include "ui/events/event_utils.h"
+#include "ui/wm/core/default_activation_client.h"
 
 using testing::_;
 
@@ -207,6 +208,7 @@ class RenderWidgetHostViewAuraTest : public testing::Test {
         scoped_ptr<ui::ContextFactory>(new ui::InProcessContextFactory));
     aura_test_helper_.reset(new aura::test::AuraTestHelper(&message_loop_));
     aura_test_helper_->SetUp();
+    new wm::DefaultActivationClient(aura_test_helper_->root_window());
 
     browser_context_.reset(new TestBrowserContext);
     process_host_ = new MockRenderProcessHost(browser_context_.get());

diff --git a/content/content_tests.gypi b/content/content_tests.gypi
@@ -305,6 +305,7 @@
           'dependencies': [
             '../ui/aura/aura.gyp:aura_test_support',
             '../ui/resources/ui_resources.gyp:ui_test_pak',
+            '../ui/wm/wm.gyp:wm',
           ],
         }],
         ['use_aura==1 or OS=="mac"', {
@@ -859,6 +860,7 @@
         ['use_aura==1', {
           'dependencies': [
             '../ui/aura/aura.gyp:aura',
+            '../ui/wm/wm.gyp:wm',
           ]
         }],
         ['use_aura==1 or toolkit_views==1', {

diff --git a/content/public/test/test_renderer_host.cc b/content/public/test/test_renderer_host.cc
@@ -25,6 +25,7 @@
 #if defined(USE_AURA)
 #include "ui/aura/test/aura_test_helper.h"
 #include "ui/compositor/test/context_factories_for_test.h"
+#include "ui/wm/core/default_activation_client.h"
 #endif
 
 namespace content {
@@ -174,6 +175,7 @@ void RenderViewHostTestHarness::SetUp() {
   aura_test_helper_.reset(
       new aura::test::AuraTestHelper(base::MessageLoopForUI::current()));
   aura_test_helper_->SetUp();
+  new wm::DefaultActivationClient(aura_test_helper_->root_window());
 #endif
 
   DCHECK(!browser_context_);

diff --git a/content/shell/browser/shell_platform_data_aura.cc b/content/shell/browser/shell_platform_data_aura.cc
@@ -6,7 +6,6 @@
 
 #include "content/shell/browser/shell.h"
 #include "ui/aura/client/aura_constants.h"
-#include "ui/aura/client/default_activation_client.h"
 #include "ui/aura/client/default_capture_client.h"
 #include "ui/aura/env.h"
 #include "ui/aura/layout_manager.h"
@@ -18,6 +17,7 @@
 #include "ui/base/ime/input_method_delegate.h"
 #include "ui/base/ime/input_method_factory.h"
 #include "ui/gfx/screen.h"
+#include "ui/wm/core/default_activation_client.h"
 
 namespace content {
 
@@ -121,8 +121,7 @@ ShellPlatformDataAura::ShellPlatformDataAura(const gfx::Size& initial_size) {
   focus_client_.reset(new aura::test::TestFocusClient());
   aura::client::SetFocusClient(host_->window(), focus_client_.get());
 
-  activation_client_.reset(
-      new aura::client::DefaultActivationClient(host_->window()));
+  new wm::DefaultActivationClient(host_->window());
   capture_client_.reset(
       new aura::client::DefaultCaptureClient(host_->window()));
   window_tree_client_.reset(

diff --git a/content/shell/browser/shell_platform_data_aura.h b/content/shell/browser/shell_platform_data_aura.h
@@ -10,7 +10,6 @@
 
 namespace aura {
 namespace client {
-class DefaultActivationClient;
 class DefaultCaptureClient;
 class FocusClient;
 class WindowTreeClient;
@@ -40,7 +39,6 @@ class ShellPlatformDataAura {
  private:
   scoped_ptr<aura::WindowTreeHost> host_;
   scoped_ptr<aura::client::FocusClient> focus_client_;
-  scoped_ptr<aura::client::DefaultActivationClient> activation_client_;
   scoped_ptr<aura::client::DefaultCaptureClient> capture_client_;
   scoped_ptr<aura::client::WindowTreeClient> window_tree_client_;
   scoped_ptr<ui::EventHandler> ime_filter_;

diff --git a/mojo/examples/launcher/DEPS b/mojo/examples/launcher/DEPS
@@ -8,5 +8,6 @@ include_rules = [
   "+ui/gfx",
   "+ui/gl",
   "+ui/views",
+  "+ui/wm",
   "+webkit/common/gpu",
 ]
diff --git a/mojo/examples/launcher/launcher.cc b/mojo/examples/launcher/launcher.cc
@@ -23,7 +23,6 @@
 #include "mojo/public/interfaces/shell/shell.mojom.h"
 #include "mojo/services/native_viewport/native_viewport.mojom.h"
 #include "ui/aura/client/aura_constants.h"
-#include "ui/aura/client/default_activation_client.h"
 #include "ui/aura/client/default_capture_client.h"
 #include "ui/aura/client/window_tree_client.h"
 #include "ui/aura/env.h"
@@ -45,6 +44,7 @@
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
+#include "ui/wm/core/default_activation_client.h"
 #include "url/gurl.h"
 
 #if defined(WIN32)
@@ -244,8 +244,7 @@ class LauncherImpl : public Application,
     focus_client_.reset(new aura::test::TestFocusClient());
     aura::client::SetFocusClient(window_tree_host_->window(),
                                  focus_client_.get());
-    activation_client_.reset(
-        new aura::client::DefaultActivationClient(window_tree_host_->window()));
+    new wm::DefaultActivationClient(window_tree_host_->window());
     capture_client_.reset(
         new aura::client::DefaultCaptureClient(window_tree_host_->window()));
     ime_filter_.reset(new MinimalInputEventFilter(window_tree_host_->window()));
@@ -263,7 +262,6 @@ class LauncherImpl : public Application,
 
   scoped_ptr<DemoScreen> screen_;
   scoped_ptr<LauncherWindowTreeClient> window_tree_client_;
-  scoped_ptr<aura::client::DefaultActivationClient> activation_client_;
   scoped_ptr<aura::client::FocusClient> focus_client_;
   scoped_ptr<aura::client::DefaultCaptureClient> capture_client_;
   scoped_ptr<ui::EventHandler> ime_filter_;

diff --git a/mojo/mojo_examples.gypi b/mojo/mojo_examples.gypi
@@ -255,6 +255,7 @@
             '../ui/gfx/gfx.gyp:gfx',
             '../ui/gfx/gfx.gyp:gfx_geometry',
             '../ui/views/views.gyp:views',
+            '../ui/wm/wm.gyp:wm',
             '../url/url.gyp:url_lib',
             'mojo_aura_demo_support',
             'mojo_common_lib',

diff --git a/ui/aura/aura.gyp b/ui/aura/aura.gyp
@@ -36,8 +36,6 @@
         'client/cursor_client.h',
         'client/cursor_client_observer.h',
         'client/cursor_client_observer.cc',
-        'client/default_activation_client.cc',
-        'client/default_activation_client.h',
         'client/default_capture_client.cc',
         'client/default_capture_client.h',
         'client/event_client.cc',

diff --git a/ui/aura/client/default_activation_client.h b/ui/aura/client/default_activation_client.h
diff --git a/ui/aura/test/aura_test_helper.cc b/ui/aura/test/aura_test_helper.cc
@@ -7,7 +7,6 @@
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "ui/aura/client/aura_constants.h"
-#include "ui/aura/client/default_activation_client.h"
 #include "ui/aura/client/default_capture_client.h"
 #include "ui/aura/client/focus_client.h"
 #include "ui/aura/env.h"
@@ -71,8 +70,6 @@ void AuraTestHelper::SetUp() {
   focus_client_.reset(new TestFocusClient);
   client::SetFocusClient(root_window(), focus_client_.get());
   stacking_client_.reset(new TestWindowTreeClient(root_window()));
-  activation_client_.reset(
-      new client::DefaultActivationClient(root_window()));
   capture_client_.reset(new client::DefaultCaptureClient(root_window()));
   test_input_method_.reset(new ui::DummyInputMethod);
   root_window()->SetProperty(
@@ -88,7 +85,6 @@ void AuraTestHelper::TearDown() {
   teardown_called_ = true;
   test_input_method_.reset();
   stacking_client_.reset();
-  activation_client_.reset();
   capture_client_.reset();
   focus_client_.reset();
   client::SetFocusClient(root_window(), NULL);

diff --git a/ui/aura/test/aura_test_helper.h b/ui/aura/test/aura_test_helper.h
@@ -22,7 +22,6 @@ class ScopedAnimationDurationScaleMode;
 namespace aura {
 class TestScreen;
 namespace client {
-class DefaultActivationClient;
 class DefaultCaptureClient;
 class FocusClient;
 }
@@ -60,7 +59,6 @@ class AuraTestHelper {
   bool owns_host_;
   scoped_ptr<WindowTreeHost> host_;
   scoped_ptr<TestWindowTreeClient> stacking_client_;
-  scoped_ptr<client::DefaultActivationClient> activation_client_;
   scoped_ptr<client::DefaultCaptureClient> capture_client_;
   scoped_ptr<ui::InputMethod> test_input_method_;
   scoped_ptr<client::FocusClient> focus_client_;

diff --git a/ui/keyboard/keyboard.gyp b/ui/keyboard/keyboard.gyp
@@ -91,6 +91,7 @@
         '../gfx/gfx.gyp:gfx',
         '../gfx/gfx.gyp:gfx_geometry',
         '../resources/ui_resources.gyp:ui_test_pak',
+        '../wm/wm.gyp:wm',
         'keyboard',
       ],
       'sources': [

diff --git a/ui/keyboard/keyboard_controller_unittest.cc b/ui/keyboard/keyboard_controller_unittest.cc
@@ -28,6 +28,7 @@
 #include "ui/keyboard/keyboard_controller_proxy.h"
 #include "ui/keyboard/keyboard_switches.h"
 #include "ui/keyboard/keyboard_util.h"
+#include "ui/wm/core/default_activation_client.h"
 
 namespace keyboard {
 namespace {
@@ -168,6 +169,7 @@ class KeyboardControllerTest : public testing::Test {
 
     aura_test_helper_.reset(new aura::test::AuraTestHelper(&message_loop_));
     aura_test_helper_->SetUp();
+    new wm::DefaultActivationClient(aura_test_helper_->root_window());
     ui::SetUpInputMethodFactoryForTesting();
     focus_controller_.reset(new TestFocusController(root_window()));
     proxy_ = new TestKeyboardControllerProxy();

diff --git a/ui/snapshot/DEPS b/ui/snapshot/DEPS
@@ -8,4 +8,5 @@ include_rules = [
   "+ui/compositor",
   "+ui/gfx",
   "+ui/gl",
+  "+ui/wm",
 ]
diff --git a/ui/snapshot/snapshot.gyp b/ui/snapshot/snapshot.gyp
@@ -68,6 +68,7 @@
             '../aura/aura.gyp:aura_test_support',
             '../compositor/compositor.gyp:compositor',
             '../compositor/compositor.gyp:compositor_test_support',
+            '../wm/wm.gyp:wm',
           ],
         }],
         # See http://crbug.com/162998#c4 for why this is needed.