diff options
| author | gene@chromium.org <gene@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-10 19:32:22 +0000 |
|---|---|---|
| committer | gene@chromium.org <gene@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-10 19:32:22 +0000 |
| commit | 20db74f3cdfd2e52880ab4dad0f2104a4a2e7cc4 (patch) | |
| tree | 237f2dcd32cd6e9c74cd326a147139702470f6c1 /ash/test | |
| parent | f5bf5ba29880002b7240bed7bba73f966295bf72 (diff) | |
| download | chromium_src-20db74f3cdfd2e52880ab4dad0f2104a4a2e7cc4.zip chromium_src-20db74f3cdfd2e52880ab4dad0f2104a4a2e7cc4.tar.gz chromium_src-20db74f3cdfd2e52880ab4dad0f2104a4a2e7cc4.tar.bz2 | |
Revert 263043 "Remove obsolete scale related APIs for cursor"
> Remove obsolete scale related APIs for cursor
> This has been replaced with SetDisplay a while ago.
>
> BUG=None
>
> Review URL: https://codereview.chromium.org/233053003
TBR=oshima@chromium.org
Review URL: https://codereview.chromium.org/233693002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@263048 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/test')
| -rw-r--r-- | ash/test/cursor_manager_test_api.cc | 4 | ||||
| -rw-r--r-- | ash/test/cursor_manager_test_api.h | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/ash/test/cursor_manager_test_api.cc b/ash/test/cursor_manager_test_api.cc index 22aa261..0b7711b9 100644 --- a/ash/test/cursor_manager_test_api.cc +++ b/ash/test/cursor_manager_test_api.cc @@ -23,6 +23,10 @@ CursorManagerTestApi::~CursorManagerTestApi() { } // TODO(tdanderson): CursorManagerTestApi may no longer be needed. +float CursorManagerTestApi::GetCurrentScale() const { + return cursor_manager_->GetScale(); +} + ui::CursorSetType CursorManagerTestApi::GetCurrentCursorSet() const { return cursor_manager_->GetCursorSet(); } diff --git a/ash/test/cursor_manager_test_api.h b/ash/test/cursor_manager_test_api.h index 1b9c6b8..d368216 100644 --- a/ash/test/cursor_manager_test_api.h +++ b/ash/test/cursor_manager_test_api.h @@ -26,6 +26,7 @@ class CursorManagerTestApi { explicit CursorManagerTestApi(::wm::CursorManager* cursor_manager); ~CursorManagerTestApi(); + float GetCurrentScale() const; ui::CursorSetType GetCurrentCursorSet() const; gfx::NativeCursor GetCurrentCursor() const; gfx::Display GetDisplay() const; |