diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-26 14:48:10 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-26 14:48:10 +0000 |
| commit | bcd1567c3bfdb094b2c24e0935ed16f08b0d1e41 (patch) | |
| tree | 8d170862fabd03b266f6960f1dd615a987872a62 /ui/keyboard | |
| parent | b596068321d72606cd8e65204380e2b23b9169cc (diff) | |
| download | chromium_src-bcd1567c3bfdb094b2c24e0935ed16f08b0d1e41.zip chromium_src-bcd1567c3bfdb094b2c24e0935ed16f08b0d1e41.tar.gz chromium_src-bcd1567c3bfdb094b2c24e0935ed16f08b0d1e41.tar.bz2 | |
Move wm/public into wm target
TBR=sky@chromium.org
http://crbug/com/308710
Review URL: https://codereview.chromium.org/209383003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@259580 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/keyboard')
| -rw-r--r-- | ui/keyboard/keyboard.gyp | 3 | ||||
| -rw-r--r-- | ui/keyboard/keyboard_controller_unittest.cc | 12 |
2 files changed, 8 insertions, 7 deletions
diff --git a/ui/keyboard/keyboard.gyp b/ui/keyboard/keyboard.gyp index fe359c6..2067387 100644 --- a/ui/keyboard/keyboard.gyp +++ b/ui/keyboard/keyboard.gyp @@ -48,7 +48,7 @@ '../events/events.gyp:events', '../gfx/gfx.gyp:gfx', '../gfx/gfx.gyp:gfx_geometry', - '../wm/wm.gyp:wm_core', + '../wm/wm.gyp:wm', 'keyboard_resources', ], 'defines': [ @@ -91,6 +91,7 @@ '../gfx/gfx.gyp:gfx', '../gfx/gfx.gyp:gfx_geometry', '../resources/ui_resources.gyp:ui_test_pak', + '../wm/wm.gyp:wm_test_support', 'keyboard', ], 'sources': [ diff --git a/ui/keyboard/keyboard_controller_unittest.cc b/ui/keyboard/keyboard_controller_unittest.cc index d735883..c797013 100644 --- a/ui/keyboard/keyboard_controller_unittest.cc +++ b/ui/keyboard/keyboard_controller_unittest.cc @@ -9,7 +9,6 @@ #include "testing/gtest/include/gtest/gtest.h" #include "ui/aura/client/focus_client.h" #include "ui/aura/layout_manager.h" -#include "ui/aura/test/aura_test_helper.h" #include "ui/aura/test/event_generator.h" #include "ui/aura/test/test_window_delegate.h" #include "ui/aura/window.h" @@ -27,6 +26,7 @@ #include "ui/keyboard/keyboard_controller_observer.h" #include "ui/keyboard/keyboard_controller_proxy.h" #include "ui/keyboard/keyboard_switches.h" +#include "ui/wm/test/wm_test_helper.h" namespace keyboard { namespace { @@ -165,8 +165,8 @@ class KeyboardControllerTest : public testing::Test { bool enable_pixel_output = false; ui::InitializeContextFactoryForTests(enable_pixel_output); - aura_test_helper_.reset(new aura::test::AuraTestHelper(&message_loop_)); - aura_test_helper_->SetUp(); + wm_test_helper_.reset(new wm::WMTestHelper); + wm_test_helper_->SetUp(); ui::SetUpInputMethodFactoryForTesting(); focus_controller_.reset(new TestFocusController(root_window())); proxy_ = new TestKeyboardControllerProxy(); @@ -176,11 +176,11 @@ class KeyboardControllerTest : public testing::Test { virtual void TearDown() OVERRIDE { controller_.reset(); focus_controller_.reset(); - aura_test_helper_->TearDown(); + wm_test_helper_->TearDown(); ui::TerminateContextFactoryForTests(); } - aura::Window* root_window() { return aura_test_helper_->root_window(); } + aura::Window* root_window() { return wm_test_helper_->root_window(); } KeyboardControllerProxy* proxy() { return proxy_; } KeyboardController* controller() { return controller_.get(); } @@ -202,7 +202,7 @@ class KeyboardControllerTest : public testing::Test { } base::MessageLoopForUI message_loop_; - scoped_ptr<aura::test::AuraTestHelper> aura_test_helper_; + scoped_ptr<aura::test::AuraTestHelper> wm_test_helper_; scoped_ptr<TestFocusController> focus_controller_; private: |