Fix the issue of cursor being shown at startup.

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 26 matching lines @@
 namespace chrome {
 
 bool ShouldOpenAshOnStartup() {
 #if defined(OS_CHROMEOS)
   return true;
 #endif
   // TODO(scottmg): http://crbug.com/133312, will need this for Win8 too.
   return false;
 }
 
+#if defined(OS_CHROMEOS)
+// Returns true if the cursor should be initially hidden.
+bool ShouldInitiallyHideCursor() {
+  if (base::chromeos::IsRunningOnChromeOS())
+    return !chromeos::UserManager::Get()->IsUserLoggedIn();
+  else
+    return CommandLine::ForCurrentProcess()->HasSwitch(switches::kLoginManager);
+}
+#endif
+
 void OpenAsh() {
   bool use_fullscreen = CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kAuraHostWindowUseFullscreen);
 
 #if defined(OS_CHROMEOS)
   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();
   }
+
+  // Hide the mouse cursor completely at boot.
+  if (ShouldInitiallyHideCursor())
+    ash::Shell::set_initially_hide_cursor(true);
 #endif
-  if (use_fullscreen) {
+
+  if (use_fullscreen)
     aura::SetUseFullscreenHostWindow(true);
-#if defined(OS_CHROMEOS)
-    // 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);
 
   // Shell takes ownership of ChromeShellDelegate.
   ash::Shell* shell = ash::Shell::CreateInstance(new ChromeShellDelegate);
   shell->event_rewriter_filter()->SetEventRewriterDelegate(
       scoped_ptr<ash::EventRewriterDelegate>(new EventRewriter).Pass());
   shell->accelerator_controller()->SetScreenshotDelegate(
       scoped_ptr<ash::ScreenshotDelegate>(new ScreenshotTaker).Pass());
@@ skipping 20 matching lines @@
 #endif
   ash::Shell::GetPrimaryRootWindow()->ShowRootWindow();
 }
 
 void CloseAsh() {
   if (ash::Shell::HasInstance())
     ash::Shell::DeleteInstance();
 }
 
 }  // namespace chrome