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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/wm/window_manager_unittest.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/wm/session_state_controller_impl2.cc ('k') | content/browser/renderer_host/render_widget_host_view_aura.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/window_manager_unittest.cc
===================================================================
--- ash/wm/window_manager_unittest.cc (revision 177177)
+++ ash/wm/window_manager_unittest.cc (working copy)
@@ -671,7 +671,7 @@
// If someone else made cursor invisible keep it invisible even after it
// received mouse events.
- cursor_manager->ShowCursor(false);
+ cursor_manager->DisableMouseEvents();
root_window->AsRootWindowHostDelegate()->OnHostMouseEvent(&mouse_moved);
EXPECT_FALSE(cursor_manager->IsCursorVisible());
root_window->AsRootWindowHostDelegate()->OnHostTouchEvent(&touch_pressed2);
@@ -682,7 +682,7 @@
EXPECT_FALSE(cursor_manager->IsCursorVisible());
// Back to normal.
- cursor_manager->ShowCursor(true);
+ cursor_manager->EnableMouseEvents();
root_window->AsRootWindowHostDelegate()->OnHostMouseEvent(&mouse_moved);
EXPECT_TRUE(cursor_manager->IsCursorVisible());
root_window->AsRootWindowHostDelegate()->OnHostTouchEvent(&touch_pressed2);
« no previous file with comments | « ash/wm/session_state_controller_impl2.cc ('k') | content/browser/renderer_host/render_widget_host_view_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698