Implement large cursors in Mushrome.

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/ash_constants.h"
 #include "ash/display/mirror_window_controller.h"
 #include "ash/display/window_tree_host_manager.h"
 #include "ash/public/cpp/shell_window_ids.h"
@@ skipping 72 matching lines @@
   gfx::Size size_;
 
   DISALLOW_COPY_AND_ASSIGN(CursorWindowDelegate);
 };
 
 CursorWindowController::CursorWindowController()
     : is_cursor_compositing_enabled_(false),
       container_(NULL),
       cursor_type_(ui::CursorType::kNone),
       visible_(true),
-      cursor_set_(ui::CURSOR_SET_NORMAL),
+      cursor_size_(ui::CursorSize::kNormal),
       large_cursor_size_in_dip_(ash::kDefaultLargeCursorSize),
       delegate_(new CursorWindowDelegate()) {}
 
 CursorWindowController::~CursorWindowController() {
   SetContainer(NULL);
 }
 
 void CursorWindowController::SetLargeCursorSizeInDip(
     int large_cursor_size_in_dip) {
   large_cursor_size_in_dip =
@@ skipping 79 matching lines @@
 }
 
 void CursorWindowController::SetCursor(gfx::NativeCursor cursor) {
   if (cursor_type_ == cursor.native_type())
     return;
   cursor_type_ = cursor.native_type();
   UpdateCursorImage();
   UpdateCursorVisibility();
 }
 
-void CursorWindowController::SetCursorSet(ui::CursorSetType cursor_set) {
-  cursor_set_ = cursor_set;
+void CursorWindowController::SetCursorSize(ui::CursorSize cursor_size) {
+  cursor_size_ = cursor_size;
   UpdateCursorImage();
 }
 
 void CursorWindowController::SetVisibility(bool visible) {
   visible_ = visible;
   UpdateCursorVisibility();
 }
 
 void CursorWindowController::SetContainer(aura::Window* container) {
   if (container_ == container)
@@ skipping 34 matching lines @@
     const float original_scale = Shell::Get()
                                      ->display_manager()
                                      ->GetDisplayInfo(display_.id())
                                      .device_scale_factor();
     // And use the nearest resource scale factor.
     cursor_scale =
         ui::GetScaleForScaleFactor(ui::GetSupportedScaleFactor(original_scale));
   }
   int resource_id;
   // TODO(hshi): support custom cursor set.
-  if (!ui::GetCursorDataFor(cursor_set_, cursor_type_, cursor_scale,
+  if (!ui::GetCursorDataFor(cursor_size_, cursor_type_, cursor_scale,
                             &resource_id, &hot_point_)) {
     return;
   }
   const gfx::ImageSkia* image =
       ResourceBundle::GetSharedInstance().GetImageSkiaNamed(resource_id);
   if (!is_cursor_compositing_enabled_) {
     gfx::ImageSkia rotated = *image;
     switch (display_.rotation()) {
       case display::Display::ROTATE_0:
         break;
@@ skipping 21 matching lines @@
     delegate_->SetCursorImage(
         image_rep.pixel_size(),
         gfx::ImageSkia::CreateFrom1xBitmap(image_rep.sk_bitmap()));
   } else {
     gfx::ImageSkia resized = *image;
 
     // Rescale cursor size. This is used with the combination of accessibility
     // large cursor. We don't need to care about the case where cursor
     // compositing is disabled as we always use cursor compositing if
     // accessibility large cursor is enabled.
-    if (cursor_set_ == ui::CursorSetType::CURSOR_SET_LARGE &&
+    if (cursor_size_ == ui::CursorSize::kLarge &&
         large_cursor_size_in_dip_ != image->size().width()) {
       float rescale = static_cast<float>(large_cursor_size_in_dip_) /
                       static_cast<float>(image->size().width());
       resized = gfx::ImageSkiaOperations::CreateResizedImage(
           *image, skia::ImageOperations::ResizeMethod::RESIZE_GOOD,
           gfx::ScaleToCeiledSize(image->size(), rescale));
       hot_point_ = gfx::ScaleToCeiledPoint(hot_point_, rescale);
     }
 
     const gfx::ImageSkiaRep& image_rep =
@@ skipping 20 matching lines @@
     cursor_window_->Show();
   else
     cursor_window_->Hide();
 }
 
 const gfx::ImageSkia& CursorWindowController::GetCursorImageForTest() const {
   return delegate_->cursor_image();
 }
 
 }  // namespace ash