diff options
author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-13 15:31:49 +0000 |
---|---|---|
committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-13 15:31:49 +0000 |
commit | 521c703f8d62fa698c3e88287c64d8d23f9ac675 (patch) | |
tree | 2e50833697a511a3cbc1f589fc4e17d466b82f03 /ash/test | |
parent | 46e49bdb2dcac1f906d01c8373e9fc3c8ce2186c (diff) | |
download | chromium_src-521c703f8d62fa698c3e88287c64d8d23f9ac675.zip chromium_src-521c703f8d62fa698c3e88287c64d8d23f9ac675.tar.gz chromium_src-521c703f8d62fa698c3e88287c64d8d23f9ac675.tar.bz2 |
Move wm/core to wm namespace.
Also sets up new targets for wm_core, wm_core_unittests, etc.
R=sky@chromium.org
TBR=sky@chromium.org
BUG=
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=256680
Review URL: https://codereview.chromium.org/196063002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@256839 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/test')
-rw-r--r-- | ash/test/ash_test_helper.cc | 4 | ||||
-rw-r--r-- | ash/test/ash_test_helper.h | 6 | ||||
-rw-r--r-- | ash/test/cursor_manager_test_api.cc | 2 | ||||
-rw-r--r-- | ash/test/cursor_manager_test_api.h | 8 | ||||
-rw-r--r-- | ash/test/shell_test_api.cc | 2 | ||||
-rw-r--r-- | ash/test/shell_test_api.h | 8 |
6 files changed, 12 insertions, 18 deletions
diff --git a/ash/test/ash_test_helper.cc b/ash/test/ash_test_helper.cc index 50e9841..33dbb83 100644 --- a/ash/test/ash_test_helper.cc +++ b/ash/test/ash_test_helper.cc @@ -52,7 +52,7 @@ AshTestHelper::~AshTestHelper() { } void AshTestHelper::SetUp(bool start_session) { - wm_state_.reset(new views::corewm::WMState); + wm_state_.reset(new wm::WMState); // Disable animations during tests. zero_duration_mode_.reset(new ui::ScopedAnimationDurationScaleMode( @@ -126,7 +126,7 @@ void AshTestHelper::TearDown() { ui::ShutdownInputMethodForTesting(); zero_duration_mode_.reset(); - CHECK(!views::corewm::ScopedCaptureClient::IsActive()); + CHECK(!wm::ScopedCaptureClient::IsActive()); wm_state_.reset(); } diff --git a/ash/test/ash_test_helper.h b/ash/test/ash_test_helper.h index 706cfeb..a1974cb 100644 --- a/ash/test/ash_test_helper.h +++ b/ash/test/ash_test_helper.h @@ -20,11 +20,9 @@ namespace ui { class ScopedAnimationDurationScaleMode; } // namespace ui -namespace views { -namespace corewm { +namespace wm { class WMState; } -} namespace ash { namespace test { @@ -68,7 +66,7 @@ class AshTestHelper { // Owned by ash::AcceleratorController TestScreenshotDelegate* test_screenshot_delegate_; - scoped_ptr<views::corewm::WMState> wm_state_; + scoped_ptr<wm::WMState> wm_state_; // Check if DBus Thread Manager was initialized here. bool dbus_thread_manager_initialized_; diff --git a/ash/test/cursor_manager_test_api.cc b/ash/test/cursor_manager_test_api.cc index b4c289a..0b7711b9 100644 --- a/ash/test/cursor_manager_test_api.cc +++ b/ash/test/cursor_manager_test_api.cc @@ -15,7 +15,7 @@ namespace ash { namespace test { CursorManagerTestApi::CursorManagerTestApi( - views::corewm::CursorManager* cursor_manager) + wm::CursorManager* cursor_manager) : cursor_manager_(cursor_manager) { } diff --git a/ash/test/cursor_manager_test_api.h b/ash/test/cursor_manager_test_api.h index 9cffac5..d368216 100644 --- a/ash/test/cursor_manager_test_api.h +++ b/ash/test/cursor_manager_test_api.h @@ -13,11 +13,9 @@ namespace gfx { class Display; } -namespace views { -namespace corewm { +namespace wm { class CursorManager; } -} namespace ash { namespace test { @@ -25,7 +23,7 @@ namespace test { // Use the api in this class to test CursorManager. class CursorManagerTestApi { public: - explicit CursorManagerTestApi(views::corewm::CursorManager* cursor_manager); + explicit CursorManagerTestApi(::wm::CursorManager* cursor_manager); ~CursorManagerTestApi(); float GetCurrentScale() const; @@ -34,7 +32,7 @@ class CursorManagerTestApi { gfx::Display GetDisplay() const; private: - views::corewm::CursorManager* cursor_manager_; + ::wm::CursorManager* cursor_manager_; DISALLOW_COPY_AND_ASSIGN(CursorManagerTestApi); }; diff --git a/ash/test/shell_test_api.cc b/ash/test/shell_test_api.cc index 07efa52..5d2ec11 100644 --- a/ash/test/shell_test_api.cc +++ b/ash/test/shell_test_api.cc @@ -22,7 +22,7 @@ internal::RootWindowLayoutManager* ShellTestApi::root_window_layout() { return shell_->GetPrimaryRootWindowController()->root_window_layout(); } -views::corewm::InputMethodEventFilter* +wm::InputMethodEventFilter* ShellTestApi::input_method_event_filter() { return shell_->input_method_filter_.get(); } diff --git a/ash/test/shell_test_api.h b/ash/test/shell_test_api.h index 7306b3d..12e40b7 100644 --- a/ash/test/shell_test_api.h +++ b/ash/test/shell_test_api.h @@ -7,11 +7,9 @@ #include "base/basictypes.h" -namespace views { -namespace corewm { +namespace wm { class InputMethodEventFilter; -} // namespace corewm -} // namespace views +} // namespace wm namespace ash { class AshNativeCursorManager; @@ -37,7 +35,7 @@ public: explicit ShellTestApi(Shell* shell); internal::RootWindowLayoutManager* root_window_layout(); - views::corewm::InputMethodEventFilter* input_method_event_filter(); + ::wm::InputMethodEventFilter* input_method_event_filter(); internal::SystemGestureEventFilter* system_gesture_event_filter(); internal::WorkspaceController* workspace_controller(); internal::ScreenPositionController* screen_position_controller(); |