diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-28 19:46:22 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-28 19:46:22 +0000 |
| commit | 995d3145768f6f2c171546853be7359e46e1f444 (patch) | |
| tree | f89bc85f412afa25452c3e28e328fa36cdd8ba5f /chrome/test | |
| parent | 7c34d000dcd44dcf76f43aaa97c684f37c43b526 (diff) | |
| download | chromium_src-995d3145768f6f2c171546853be7359e46e1f444.zip chromium_src-995d3145768f6f2c171546853be7359e46e1f444.tar.gz chromium_src-995d3145768f6f2c171546853be7359e46e1f444.tar.bz2 | |
Revert 266616 "Move DefaultActivationClient to wm/core"
> 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
>
> Review URL: https://codereview.chromium.org/250113002
TBR=ben@chromium.org
Review URL: https://codereview.chromium.org/259103003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266632 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
| -rw-r--r-- | chrome/test/base/browser_with_test_window_test.cc | 2 | ||||
| -rw-r--r-- | chrome/test/base/view_event_test_base.cc | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/chrome/test/base/browser_with_test_window_test.cc b/chrome/test/base/browser_with_test_window_test.cc index e5de4b2..c45f7fa 100644 --- a/chrome/test/base/browser_with_test_window_test.cc +++ b/chrome/test/base/browser_with_test_window_test.cc @@ -20,7 +20,6 @@ #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) @@ -71,7 +70,6 @@ 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 index aae31d9..d2ace62 100644 --- a/chrome/test/base/view_event_test_base.cc +++ b/chrome/test/base/view_event_test_base.cc @@ -24,7 +24,6 @@ #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) @@ -141,7 +140,6 @@ 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 |