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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/magnifier/magnification_controller.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/display/mouse_cursor_event_filter_unittest.cc ('k') | ash/shell.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/magnifier/magnification_controller.cc
===================================================================
--- ash/magnifier/magnification_controller.cc (revision 177177)
+++ ash/magnifier/magnification_controller.cc (working copy)
@@ -343,7 +343,7 @@
// animation.
if (!cursor_client->IsCursorVisible())
return;
- cursor_client->ShowCursor(false);
+ cursor_client->DisableMouseEvents();
}
move_cursor_after_animation_ = true;
position_after_animation_ = location;
@@ -393,7 +393,7 @@
aura::client::CursorClient* cursor_client =
aura::client::GetCursorClient(root_window_);
if (cursor_client)
- cursor_client->ShowCursor(true);
+ cursor_client->EnableMouseEvents();
}
is_on_animation_ = false;
« no previous file with comments | « ash/display/mouse_cursor_event_filter_unittest.cc ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698