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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/shell.cc

Issue 145313003: Implement cursor compositing mode on Ash (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix linux_aura build. Created 6 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
« ash/display/cursor_window_controller.cc ('K') | « ash/display/mouse_cursor_event_filter.cc ('k') | ash/test/mirror_window_test_api.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index 5b7fb0cd25108f90484d22217ef639a0e825fea3..f5564cd3770d572ed7199206678dca4980119cd3 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -953,6 +953,14 @@ void Shell::Init() {
new internal::UserActivityNotifier(user_activity_detector_.get()));
video_activity_notifier_.reset(
new internal::VideoActivityNotifier(video_detector_.get()));
+
+#if defined(USE_X11)
+ cursor_manager_.SetNativeCursorEnabled(false);
+ display_controller_->EnableCompositedCursor(
+ internal::GetRootWindowController(root_window)->GetContainer(
+ internal::kShellWindowId_OverlayContainer));
+#endif
+
#endif
weak_display_manager_factory_.reset(
« ash/display/cursor_window_controller.cc ('K') | « ash/display/mouse_cursor_event_filter.cc ('k') | ash/test/mirror_window_test_api.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698