Revert 147887 - Enable new checkbox style by default (Linux/CrOS only)

ui/base/native_theme/native_theme_base.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 "ui/base/native_theme/native_theme_base.h"
 
 #include <limits>
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 38 matching lines @@
     SkColorSetRGB(0xed, 0xed, 0xed),
     SkColorSetRGB(0xde, 0xde, 0xde) };
 const SkColor kCheckboxGradientPressedColors[] = {
     SkColorSetRGB(0xe7, 0xe7, 0xe7),
     SkColorSetRGB(0xd7, 0xd7, 0xd7) };
 const SkColor kCheckboxGradientHoveredColors[] = {
     SkColorSetRGB(0xf0, 0xf0, 0xf0),
     SkColorSetRGB(0xe0, 0xe0, 0xe0) };
 const SkColor kCheckboxGradientDisabledColors[] = {
     SkColorSetARGB(0xB3, 0xed, 0xed, 0xed),
-    SkColorSetARGB(0xB3, 0xed, 0xed, 0xed) };
+    SkColorSetARGB(0xB3, 0xde, 0xde, 0xde) };
 const SkColor kCheckboxBorderColor = SkColorSetARGB(0x40, 0, 0, 0);
 const SkColor kCheckboxBorderHoveredColor = SkColorSetARGB(0x4D, 0, 0, 0);
 const SkColor kCheckboxBorderDisabledColor = SkColorSetARGB(0x30, 0, 0, 0);
 const SkColor kCheckboxStrokeColor = SkColorSetARGB(0xB3, 0, 0, 0);
 const SkColor kCheckboxStrokeDisabledColor = SkColorSetARGB(0x86, 0, 0, 0);
 const SkColor kRadioDotColor = SkColorSetRGB(0x66, 0x66, 0x66);
 const SkColor kRadioDotDisabledColor = SkColorSetARGB(0xC0, 0x66, 0x66, 0x66);
 
 // Get lightness adjusted color.
 SkColor BrightenColor(const color_utils::HSL& hsl, SkAlpha alpha,
@@ skipping 391 matching lines @@
       DrawVertLine(canvas,
                    midx + inter_grippy_offset,
                    midy - grippy_half_width,
                    midy + grippy_half_width,
                    paint);
     }
   }
 }
 
 bool NativeThemeBase::IsNewCheckboxStyleEnabled(SkCanvas* canvas) const {
-  // The new style is now the default.
-  // TODO(rbyers): Remove this flag once we're sure the new behavior is fine.
-  // http://crbug.com/133991
-  if (!CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kOldCheckboxStyle))
+  // Mostly this new style is experimental behind a flag.
+  // TODO(rbyers): Enable new style by default.  http://crbug.com/125773
+  if (CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kNewCheckboxStyle))
+    return true;
+
+  // Also enable explicitly when high-DPI is being used (since this is the only
+  // way we have to get nice looking widgets in high-DPI.
+  if (canvas->getTotalMatrix().getScaleX() > 1)
     return true;
 
   return false;
 }
 
 void NativeThemeBase::PaintCheckbox(SkCanvas* canvas,
                                     State state,
                                     const gfx::Rect& rect,
                                     const ButtonExtraParams& button) const {
   if (IsNewCheckboxStyleEnabled(canvas)) {
@@ skipping 26 matching lines @@
 // Returns the rectangle within which any additional decorations should be
 // drawn, or empty if none.
 SkRect NativeThemeBase::PaintCheckboxRadioNewCommon(
     SkCanvas* canvas,
     State state,
     const gfx::Rect& rect,
     const SkScalar borderRadius) const {
 
   SkRect skrect = gfx::RectToSkRect(rect);
 
-  // Use the largest square rectangle that fits inside the provided rectangle.
-  // No other browser seems to support non-square widget, so accidentally
-  // having non-square sizes is common (eg. amazon and webkit dev tools).
-  if (skrect.width() != skrect.height()) {
-    SkScalar size = SkMinScalar(skrect.width(), skrect.height());
-    skrect.inset((skrect.width() - size) / 2, (skrect.height() - size) / 2);
-  }
-
   // If the rectangle is too small then paint only a rectangle.  We don't want
   // to have to worry about '- 1' and '+ 1' calculations below having overflow
   // or underflow.
-  if (skrect.width() <= 2) {
+  if (rect.width() <= 2 || rect.height() <= 2) {
     SkPaint paint;
     paint.setColor(kCheckboxTinyColor);
     paint.setStyle(SkPaint::kFill_Style);
     canvas->drawRect(skrect, paint);
     // Too small to draw anything more.
     return SkRect::MakeEmpty();
   }
 
   // Make room for the drop shadow.
   skrect.iset(skrect.x(), skrect.y(), skrect.right() - 1, skrect.bottom() - 1);
@@ skipping 577 matching lines @@
   SkScalar min_diff = Clamp((hsv1[1] + hsv2[1]) * 1.2f, 0.28f, 0.5f);
   SkScalar diff = Clamp(fabs(hsv1[2] - hsv2[2]) / 2, min_diff, 0.5f);
 
   if (hsv1[2] + hsv2[2] > 1.0)
     diff = -diff;
 
   return SaturateAndBrighten(hsv2, -0.2f, diff);
 }
 
 }  // namespace ui