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 /ui/keyboard | |
| 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 'ui/keyboard')
| -rw-r--r-- | ui/keyboard/keyboard.gyp | 1 | ||||
| -rw-r--r-- | ui/keyboard/keyboard_controller_unittest.cc | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/ui/keyboard/keyboard.gyp b/ui/keyboard/keyboard.gyp index c4ca714..153b38c 100644 --- a/ui/keyboard/keyboard.gyp +++ b/ui/keyboard/keyboard.gyp @@ -91,7 +91,6 @@ '../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 index 62b0d73..4333c84 100644 --- a/ui/keyboard/keyboard_controller_unittest.cc +++ b/ui/keyboard/keyboard_controller_unittest.cc @@ -28,7 +28,6 @@ #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 { @@ -169,7 +168,6 @@ 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(); |