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/cursor_manager_test_api.h | |
| 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/cursor_manager_test_api.h')
| -rw-r--r-- | ash/test/cursor_manager_test_api.h | 8 |
1 files changed, 3 insertions, 5 deletions
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); }; |