Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2981)

Unified Diff: ash/test/cursor_manager_test_api.cc

Issue 111043002: Cursor state should be global for desktop Aura (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Test added Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ash/test/cursor_manager_test_api.cc
diff --git a/ash/test/cursor_manager_test_api.cc b/ash/test/cursor_manager_test_api.cc
index e93b59eca7d80b770225aee6c454f338a3ad8435..3ed0226dd4b4ab52c846edc245325ced10287d92 100644
--- a/ash/test/cursor_manager_test_api.cc
+++ b/ash/test/cursor_manager_test_api.cc
@@ -22,19 +22,17 @@ CursorManagerTestApi::CursorManagerTestApi(
CursorManagerTestApi::~CursorManagerTestApi() {
}
+// TODO(tdanderson): CursorManagerTestApi may no longer be needed.
float CursorManagerTestApi::GetCurrentScale() const {
- return static_cast<views::corewm::NativeCursorManagerDelegate*>(
- cursor_manager_)->GetCurrentScale();
+ return cursor_manager_->GetScale();
}
ui::CursorSetType CursorManagerTestApi::GetCurrentCursorSet() const {
- return static_cast<views::corewm::NativeCursorManagerDelegate*>(
- cursor_manager_)->GetCurrentCursorSet();
+ return cursor_manager_->GetCursorSet();
}
gfx::NativeCursor CursorManagerTestApi::GetCurrentCursor() const {
- return static_cast<views::corewm::NativeCursorManagerDelegate*>(
- cursor_manager_)->GetCurrentCursor();
+ return cursor_manager_->GetCursor();
}
gfx::Display CursorManagerTestApi::GetDisplay() const {
« no previous file with comments | « no previous file | ash/wm/ash_native_cursor_manager.cc » ('j') | ui/views/widget/desktop_aura/desktop_native_widget_aura.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698