Move ash specific cursor code to CursorManager.

chrome/browser/ui/ash/ash_init.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/ash/ash_init.h"
 
 #include "ash/accelerators/accelerator_controller.h"
 #include "ash/ash_switches.h"
 #include "ash/high_contrast/high_contrast_controller.h"
 #include "ash/magnifier/magnification_controller.h"
@@ skipping 13 matching lines @@
 #include "ui/aura/root_window.h"
 #include "ui/compositor/compositor_setup.h"
 
 #if defined(OS_CHROMEOS)
 #include "base/chromeos/chromeos_version.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/ui/ash/brightness_controller_chromeos.h"
 #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
 
 
 namespace chrome {
 
 bool ShouldOpenAshOnStartup() {
 #if defined(OS_CHROMEOS)
   return true;
 #endif
   return CommandLine::ForCurrentProcess()->HasSwitch(switches::kOpenAsh);
 }
 
 void OpenAsh() {
   bool use_fullscreen = CommandLine::ForCurrentProcess()->HasSwitch(
       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);
 #endif
   }
 
   // Its easier to mark all windows as persisting and exclude the ones we care
   // about (browser windows), rather than explicitly excluding certain windows.
   ash::SetDefaultPersistsAcrossAllWorkspaces(true);
 
@@ skipping 25 matching lines @@
 #endif
   ash::Shell::GetPrimaryRootWindow()->ShowRootWindow();
 }
 
 void CloseAsh() {
   if (ash::Shell::GetInstance())
     ash::Shell::DeleteInstance();
 }
 
 }  // namespace chrome