Make adjustable large cursor enabled by default

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/ash_switches.h"
 #include "ash/display/mirror_window_controller.h"
 #include "ash/display/window_tree_host_manager.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/root_window_controller.h"
 #include "ash/shell.h"
-#include "base/command_line.h"
 #include "ui/aura/env.h"
 #include "ui/aura/window_delegate.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/base/cursor/cursors_aura.h"
 #include "ui/base/hit_test.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/compositor/dip_util.h"
 #include "ui/compositor/paint_recorder.h"
 #include "ui/display/display.h"
 #include "ui/display/manager/display_manager.h"
@@ skipping 63 matching lines @@
 };
 
 CursorWindowController::CursorWindowController()
     : is_cursor_compositing_enabled_(false),
       container_(NULL),
       cursor_type_(ui::kCursorNone),
       visible_(true),
       cursor_set_(ui::CURSOR_SET_NORMAL),
       large_cursor_size_in_dip_(ash::kDefaultLargeCursorSize),
       delegate_(new CursorWindowDelegate()) {
-  enable_adjustable_large_cursor_ =
-      base::CommandLine::ForCurrentProcess()->HasSwitch(
-          ash::switches::kAshAdjustableLargeCursor);
 }
 
 CursorWindowController::~CursorWindowController() {
   SetContainer(NULL);
 }
 
 void CursorWindowController::SetLargeCursorSizeInDip(
     int large_cursor_size_in_dip) {
   large_cursor_size_in_dip =
       std::min(large_cursor_size_in_dip, kMaxLargeCursorSize);
   large_cursor_size_in_dip =
       std::max(large_cursor_size_in_dip, kMinLargeCursorSize);
 
   if (large_cursor_size_in_dip_ == large_cursor_size_in_dip)
     return;
 
   large_cursor_size_in_dip_ = large_cursor_size_in_dip;
 
-  if (enable_adjustable_large_cursor_ && display_.is_valid())
+  if (display_.is_valid())
     UpdateCursorImage();
 }
 
 void CursorWindowController::SetCursorCompositingEnabled(bool enabled) {
   if (is_cursor_compositing_enabled_ != enabled) {
     is_cursor_compositing_enabled_ = enabled;
     if (display_.is_valid())
       UpdateCursorImage();
     UpdateContainer();
   }
@@ skipping 159 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 (enable_adjustable_large_cursor_ &&
-        cursor_set_ == ui::CursorSetType::CURSOR_SET_LARGE &&
+    if (cursor_set_ == ui::CursorSetType::CURSOR_SET_LARGE &&
         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