Differentiate invisible cursor mode and disabled mouse events mode.

ash/shell.cc

Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index 9a8841b691be17e2e6f694ab8a4cc643db8adc34..288958a4f9b2ad0fa44d32fd848b52c1934c5b78 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -571,12 +571,14 @@ void Shell::Init() {
   user_wallpaper_delegate_->InitializeWallpaper();
 
   if (initially_hide_cursor_)
-    cursor_manager_.DisableMouseEvents();
+    cursor_manager_.HideCursor();
   cursor_manager_.SetCursor(ui::kCursorPointer);
 
-  // Cursor might have been hidden by somethign other than chrome.
-  // Let the first mouse event show the cursor.
-  env_filter_->set_cursor_hidden_by_filter(true);
+  if (!cursor_manager_.IsCursorVisible()) {
+    // Cursor might have been hidden by something other than chrome.
+    // Let the first mouse event show the cursor.
+    env_filter_->set_cursor_hidden_by_filter(true);
+  }
 }
 
 void Shell::ShowContextMenu(const gfx::Point& location_in_screen) {