Ensure that the cursor visibility state is restored correctly on CursorManager creation.

ui/wm/core/cursor_manager.cc

 // Copyright (c) 2013 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 "ui/wm/core/cursor_manager.h"
 
 #include <utility>
 
 #include "base/logging.h"
 #include "base/macros.h"
@@ skipping 55 matching lines @@
   bool mouse_events_enabled_;
 
   // The visibility to set when mouse events are enabled.
   bool visible_on_mouse_events_enabled_;
 
   DISALLOW_COPY_AND_ASSIGN(CursorState);
 };
 
 }  // namespace internal
 
+bool CursorManager::last_cursor_visibility_state_ = true;
+
 CursorManager::CursorManager(scoped_ptr<NativeCursorManager> delegate)
     : delegate_(std::move(delegate)),
       cursor_lock_count_(0),
       current_state_(new internal::CursorState),
-      state_on_unlock_(new internal::CursorState) {}
+      state_on_unlock_(new internal::CursorState) {
+  // Restore the last cursor visibility state.
+  current_state_->SetVisible(last_cursor_visibility_state_);
+}
 
 CursorManager::~CursorManager() {
 }
 
 void CursorManager::SetCursor(gfx::NativeCursor cursor) {
   state_on_unlock_->set_cursor(cursor);
   if (cursor_lock_count_ == 0 &&
       GetCursor() != state_on_unlock_->cursor()) {
     delegate_->SetCursor(state_on_unlock_->cursor(), this);
   }
 }
 
 gfx::NativeCursor CursorManager::GetCursor() const {
   return current_state_->cursor();
 }
 
 void CursorManager::ShowCursor() {
+  last_cursor_visibility_state_ = true;
   state_on_unlock_->SetVisible(true);
   if (cursor_lock_count_ == 0 &&
       IsCursorVisible() != state_on_unlock_->visible()) {
     delegate_->SetVisibility(state_on_unlock_->visible(), this);
     FOR_EACH_OBSERVER(aura::client::CursorClientObserver, observers_,
                       OnCursorVisibilityChanged(true));
   }
 }
 
 void CursorManager::HideCursor() {
+  last_cursor_visibility_state_ = false;
   state_on_unlock_->SetVisible(false);
   if (cursor_lock_count_ == 0 &&
       IsCursorVisible() != state_on_unlock_->visible()) {
     delegate_->SetVisibility(state_on_unlock_->visible(), this);
     FOR_EACH_OBSERVER(aura::client::CursorClientObserver, observers_,
                       OnCursorVisibilityChanged(false));
   }
 }
 
 bool CursorManager::IsCursorVisible() const {
@@ skipping 92 matching lines @@
 
 void CursorManager::CommitCursorSet(ui::CursorSetType cursor_set) {
   current_state_->set_cursor_set(cursor_set);
 }
 
 void CursorManager::CommitMouseEventsEnabled(bool enabled) {
   current_state_->SetMouseEventsEnabled(enabled);
 }
 
 }  // namespace wm