Merge 173933

ash/shell.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 "ash/shell.h"
 
 #include <algorithm>
 #include <string>
 
 #include "ash/accelerators/focus_manager_factory.h"
@@ skipping 546 matching lines @@
   // Force Layout
   root_window_controller->root_window_layout()->OnWindowResized();
 
   // It needs to be created after OnWindowResized has been called, otherwise the
   // widget will not paint when restoring after a browser crash.  Also it needs
   // to be created after InitSecondaryDisplays() to initialize the wallpapers in
   // the correct size.
   user_wallpaper_delegate_->InitializeWallpaper();
 
   if (initially_hide_cursor_)
-    cursor_manager_.ShowCursor(false);
+    cursor_manager_.DisableMouseEvents();
   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);
 }
 
 void Shell::ShowContextMenu(const gfx::Point& location_in_screen) {
   // No context menus if user have not logged in.
   if (!delegate_->IsUserLoggedIn())
@@ skipping 338 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // Shell, aura::client::ActivationChangeObserver implementation:
 
 void Shell::OnWindowActivated(aura::Window* gained_active,
                               aura::Window* lost_active) {
   if (gained_active)
     active_root_window_ = gained_active->GetRootWindow();
 }
 
 }  // namespace ash