diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-30 04:48:20 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-30 04:48:20 +0000 |
| commit | f3b1efde59da33105edd6da4ee00c3c50f401a7f (patch) | |
| tree | b03c78f05efe16eaf0fedee582c0b6c9f69a0c47 /ui/views/test | |
| parent | 946cdb61e3aa5f6b7c1c8b4f143ca9099e50ccf9 (diff) | |
| download | chromium_src-f3b1efde59da33105edd6da4ee00c3c50f401a7f.zip chromium_src-f3b1efde59da33105edd6da4ee00c3c50f401a7f.tar.gz chromium_src-f3b1efde59da33105edd6da4ee00c3c50f401a7f.tar.bz2 | |
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
Diffstat (limited to 'ui/views/test')
| -rw-r--r-- | ui/views/test/views_test_base.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ui/views/test/views_test_base.cc b/ui/views/test/views_test_base.cc index 4bf036c..1a7f3aa 100644 --- a/ui/views/test/views_test_base.cc +++ b/ui/views/test/views_test_base.cc @@ -12,6 +12,7 @@ #include "ui/aura/window_event_dispatcher.h" #include "ui/compositor/test/context_factories_for_test.h" #include "ui/wm/core/capture_controller.h" +#include "ui/wm/core/default_activation_client.h" #include "ui/wm/core/wm_state.h" namespace views { @@ -39,6 +40,7 @@ void ViewsTestBase::SetUp() { aura_test_helper_.reset(new aura::test::AuraTestHelper(&message_loop_)); aura_test_helper_->SetUp(); + new wm::DefaultActivationClient(aura_test_helper_->root_window()); wm_state_.reset(new ::wm::WMState); ui::InitializeInputMethodForTesting(); } |