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

Unified Diff: chrome/browser/ui/ash/ash_init.cc

Issue 10919135: Move ash specific cursor code to CursorManager. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 3 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/toplevel_window_event_handler.cc ('k') | ui/aura/client/cursor_client.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/ash/ash_init.cc
diff --git a/chrome/browser/ui/ash/ash_init.cc b/chrome/browser/ui/ash/ash_init.cc
index 9462a66e1a46d873048fa073d18f32896d10b5d1..5b552177f039be0a0dbb4f391475738584f9c343 100644
--- a/chrome/browser/ui/ash/ash_init.cc
+++ b/chrome/browser/ui/ash/ash_init.cc
@@ -31,6 +31,7 @@
#include "chrome/browser/ui/ash/ime_controller_chromeos.h"
#include "chrome/browser/ui/ash/keyboard_brightness_controller_chromeos.h"
#include "chrome/browser/ui/ash/volume_controller_chromeos.h"
+#include "ui/base/x/x11_util.h"
#endif
@@ -48,14 +49,18 @@ void OpenAsh() {
switches::kAuraHostWindowUseFullscreen);
#if defined(OS_CHROMEOS)
- if (base::chromeos::IsRunningOnChromeOS())
+ if (base::chromeos::IsRunningOnChromeOS()) {
use_fullscreen = true;
+ // Hides the cursor outside of the Aura root window. The cursor will be
+ // drawn within the Aura root window, and it'll remain hidden after the
+ // Aura window is closed.
+ ui::HideHostCursor();
+ }
#endif
if (use_fullscreen) {
aura::DisplayManager::set_use_fullscreen_host_window(true);
#if defined(OS_CHROMEOS)
- aura::RootWindow::set_hide_host_cursor(true);
// Hide the mouse cursor completely at boot.
if (!chromeos::UserManager::Get()->IsUserLoggedIn())
ash::Shell::set_initially_hide_cursor(true);
« no previous file with comments | « ash/wm/toplevel_window_event_handler.cc ('k') | ui/aura/client/cursor_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698