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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/test/cursor_manager_test_api.cc

Issue 11956019: Merge 173933 (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1364/src/
Patch Set: Created 7 years, 11 months 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
« no previous file with comments | « ash/test/cursor_manager_test_api.h ('k') | ash/tooltips/tooltip_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/test/cursor_manager_test_api.cc
===================================================================
--- ash/test/cursor_manager_test_api.cc (revision 177177)
+++ ash/test/cursor_manager_test_api.cc (working copy)
@@ -17,11 +17,11 @@
CursorManagerTestApi::~CursorManagerTestApi() {
}
-gfx::NativeCursor CursorManagerTestApi::GetCurrentCursor() {
- return cursor_manager_->current_cursor_;
+gfx::NativeCursor CursorManagerTestApi::GetCurrentCursor() const {
+ return cursor_manager_->GetCurrentCursor();
}
-float CursorManagerTestApi::GetDeviceScaleFactor() {
+float CursorManagerTestApi::GetDeviceScaleFactor() const {
return cursor_manager_->image_cursors_->GetDeviceScaleFactor();
}
« no previous file with comments | « ash/test/cursor_manager_test_api.h ('k') | ash/tooltips/tooltip_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698