|
Merge 173933
> Make the cursor have separate mode for disabled mouse events and invisible.
>
> This CL adds the following APIs.
>
> * CursorClient::DisableMouseEvents: Makes mouse events stop being sent
> and hides the cursor if it is visible.
> (For now, DisableMouseEvents just clears the hover state and doesn't
> prevent mouse events from being generated, though).
>
> * CursorClient::EnableMouseEvents: Makes mouse events start being sent
> and shows the cursor if it was hidden with DisableMouseEvents.
>
> * CursorClient::HideCursor: Makes the cursor invisible. This changes
> only the cursor visibility and mouse events keep being sent even when
> the cursor is invisible.
>
> * CursorClient::ShowCursor: Makes the cursor visible. This does not take
> effect When mouse events are disabled.
>
> This CL just replaces the old usages of CursorClient::ShowCursor with
> the new APIs to retain existing behavior.
> I'll make another CL that uses these APIs in appropriate places.
>
> BUG= 153703
> TEST=CursorManagerTest.EnableDisableMouseEvents, CursorManagerTest.ShowAndEnable
>
> Review URL: https://chromiumcodereview.appspot.com/11412315
TBR=mazda@chromium.org
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=177178
|
Unified diffs |
Side-by-side diffs |
Delta from patch set |
Stats (+557 lines, -217 lines) |
Patch |
 |
M |
ash/display/mouse_cursor_event_filter_unittest.cc
|
View
|
|
3 chunks |
+3 lines, -6 lines |
0 comments
|
Download
|
 |
M |
ash/magnifier/magnification_controller.cc
|
View
|
|
2 chunks |
+2 lines, -2 lines |
0 comments
|
Download
|
 |
M |
ash/shell.cc
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
 |
M |
ash/test/ash_test_base.cc
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
 |
M |
ash/test/cursor_manager_test_api.h
|
View
|
|
1 chunk |
+2 lines, -2 lines |
0 comments
|
Download
|
 |
M |
ash/test/cursor_manager_test_api.cc
|
View
|
|
1 chunk |
+3 lines, -3 lines |
0 comments
|
Download
|
 |
M |
ash/tooltips/tooltip_controller_unittest.cc
|
View
|
|
1 chunk |
+2 lines, -2 lines |
0 comments
|
Download
|
 |
M |
ash/wm/cursor_manager.h
|
View
|
|
3 chunks |
+21 lines, -19 lines |
0 comments
|
Download
|
 |
M |
ash/wm/cursor_manager.cc
|
View
|
|
4 chunks |
+141 lines, -41 lines |
0 comments
|
Download
|
 |
M |
ash/wm/cursor_manager_unittest.cc
|
View
|
|
5 chunks |
+222 lines, -9 lines |
0 comments
|
Download
|
 |
M |
ash/wm/session_state_controller_impl.cc
|
View
|
|
2 chunks |
+2 lines, -2 lines |
0 comments
|
Download
|
 |
M |
ash/wm/session_state_controller_impl2.cc
|
View
|
|
3 chunks |
+3 lines, -3 lines |
0 comments
|
Download
|
 |
M |
ash/wm/window_manager_unittest.cc
|
View
|
|
2 chunks |
+2 lines, -2 lines |
0 comments
|
Download
|
 |
M |
content/browser/renderer_host/render_widget_host_view_aura.cc
|
View
|
|
3 chunks |
+3 lines, -3 lines |
0 comments
|
Download
|
 |
M |
ui/aura/client/cursor_client.h
|
View
|
|
1 chunk |
+22 lines, -7 lines |
0 comments
|
Download
|
 |
M |
ui/aura/env.h
|
View
|
|
2 chunks |
+3 lines, -9 lines |
0 comments
|
Download
|
 |
M |
ui/aura/env.cc
|
View
|
|
3 chunks |
+0 lines, -24 lines |
0 comments
|
Download
|
 |
M |
ui/aura/root_window.h
|
View
|
|
2 chunks |
+4 lines, -1 line |
0 comments
|
Download
|
 |
M |
ui/aura/root_window.cc
|
View
|
|
5 chunks |
+21 lines, -12 lines |
0 comments
|
Download
|
 |
M |
ui/aura/root_window_host.h
|
View
|
|
1 chunk |
+2 lines, -1 line |
0 comments
|
Download
|
 |
M |
ui/aura/root_window_host_linux.cc
|
View
|
|
1 chunk |
+7 lines, -0 lines |
0 comments
|
Download
|
 |
M |
ui/aura/root_window_host_win.cc
|
View
|
|
2 chunks |
+8 lines, -0 lines |
0 comments
|
Download
|
 |
M |
ui/aura/root_window_unittest.cc
|
View
|
|
1 chunk |
+0 lines, -41 lines |
0 comments
|
Download
|
 |
M |
ui/aura/window_unittest.cc
|
View
|
|
2 chunks |
+6 lines, -2 lines |
0 comments
|
Download
|
 |
M |
ui/views/corewm/compound_event_filter.cc
|
View
|
|
1 chunk |
+2 lines, -2 lines |
0 comments
|
Download
|
 |
M |
ui/views/corewm/compound_event_filter_unittest.cc
|
View
|
|
4 chunks |
+29 lines, -12 lines |
0 comments
|
Download
|
 |
M |
ui/views/widget/desktop_aura/desktop_cursor_client.h
|
View
|
|
1 chunk |
+7 lines, -1 line |
0 comments
|
Download
|
 |
M |
ui/views/widget/desktop_aura/desktop_cursor_client.cc
|
View
|
|
2 chunks |
+30 lines, -9 lines |
0 comments
|
Download
|
 |
M |
ui/views/widget/desktop_aura/desktop_root_window_host_linux.cc
|
View
|
|
2 chunks |
+8 lines, -0 lines |
0 comments
|
Download
|
Total messages: 1 (0 generated)
|