ash::CursorWindowController: handle ui::kCursorNone

ash/display/cursor_window_controller.cc

 // Copyright 2014 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/display/cursor_window_controller.h"
 
 #include "ash/display/display_controller.h"
 #include "ash/display/mirror_window_controller.h"
 #include "ash/root_window_controller.h"
 #include "ash/shell.h"
@@ skipping 75 matching lines @@
   gfx::ImageSkia cursor_image_;
   gfx::Size size_;
 
   DISALLOW_COPY_AND_ASSIGN(CursorWindowDelegate);
 };
 
 CursorWindowController::CursorWindowController()
     : is_cursor_compositing_enabled_(false),
       container_(NULL),
       cursor_type_(ui::kCursorNone),
+      visible_(true),
       cursor_set_(ui::CURSOR_SET_NORMAL),
       cursor_rotation_(gfx::Display::ROTATE_0),
       delegate_(new CursorWindowDelegate()) {
 }
 
 CursorWindowController::~CursorWindowController() {
   SetContainer(NULL);
 }
 
 void CursorWindowController::SetCursorCompositingEnabled(bool enabled) {
@@ skipping 56 matching lines @@
   cursor_window_->SetBounds(bounds);
 }
 
 void CursorWindowController::SetCursor(gfx::NativeCursor cursor) {
   if (cursor_type_ == cursor.native_type() &&
       cursor_rotation_ == display_.rotation())
     return;
   cursor_type_ = cursor.native_type();
   cursor_rotation_ = display_.rotation();
   UpdateCursorImage();
+  UpdateCursorVisibility();
 }
 
 void CursorWindowController::SetCursorSet(ui::CursorSetType cursor_set) {
   cursor_set_ = cursor_set;
   UpdateCursorImage();
 }
 
 void CursorWindowController::SetVisibility(bool visible) {
   if (!cursor_window_)
     return;
-  if (visible)
-    cursor_window_->Show();
-  else
-    cursor_window_->Hide();
+  visible_ = visible;
+  UpdateCursorVisibility();
 }
 
 void CursorWindowController::SetContainer(aura::Window* container) {
   if (container_ == container)
     return;
   container_ = container;
   if (!container) {
     cursor_window_.reset();
     return;
   }
 
   // Reusing the window does not work when the display is disconnected.
   // Just creates a new one instead. crbug.com/384218.
   cursor_window_.reset(new aura::Window(delegate_.get()));
   cursor_window_->SetTransparent(true);
   cursor_window_->Init(aura::WINDOW_LAYER_TEXTURED);
   cursor_window_->set_ignore_events(true);
   cursor_window_->set_owned_by_parent(false);
   UpdateCursorImage();
 
   container->AddChild(cursor_window_.get());
-  cursor_window_->Show();
+  UpdateCursorVisibility();
   SetBoundsInScreen(container->bounds());
 }
 
 void CursorWindowController::SetBoundsInScreen(const gfx::Rect& bounds) {
   bounds_in_screen_ = bounds;
   UpdateLocation();
 }
 
 void CursorWindowController::UpdateCursorImage() {
   int resource_id;
@@ skipping 40 matching lines @@
   }
   delegate_->SetCursorImage(rotated, display_);
   if (cursor_window_) {
     cursor_window_->SetBounds(gfx::Rect(delegate_->size()));
     cursor_window_->SchedulePaintInRect(
         gfx::Rect(cursor_window_->bounds().size()));
     UpdateLocation();
   }
 }
 
+void CursorWindowController::UpdateCursorVisibility() {
+  if (!cursor_window_)
+    return;
+  bool visible = (visible_ && cursor_type_ != ui::kCursorNone);
+  if (visible)
+    cursor_window_->Show();
+  else
+    cursor_window_->Hide();
+}
+
 }  // namespace ash