Upstream for a thing

ui/views/controls/combobox/combobox.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/views/controls/combobox/combobox.h"
 
 #include <stddef.h>
 
 #include <utility>
 
 #include "base/logging.h"
 #include "base/macros.h"
 #include "build/build_config.h"
 #include "ui/accessibility/ax_node_data.h"
 #include "ui/base/default_style.h"
 #include "ui/base/ime/input_method.h"
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/base/models/combobox_model_observer.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/events/event.h"
 #include "ui/gfx/animation/throb_animation.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/scoped_canvas.h"
 #include "ui/gfx/text_utils.h"
 #include "ui/native_theme/common_theme.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/native_theme/native_theme_aura.h"
 #include "ui/resources/grit/ui_resources.h"
-#include "ui/views/animation/flood_fill_ink_drop_ripple.h"
 #include "ui/views/animation/ink_drop_highlight.h"
 #include "ui/views/animation/ink_drop_impl.h"
+#include "ui/views/animation/ink_drop_ripple.h"
 #include "ui/views/background.h"
 #include "ui/views/controls/button/custom_button.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/combobox/combobox_listener.h"
 #include "ui/views/controls/focus_ring.h"
 #include "ui/views/controls/focusable_border.h"
 #include "ui/views/controls/menu/menu_config.h"
 #include "ui/views/controls/menu/menu_runner.h"
 #include "ui/views/controls/prefix_selector.h"
 #include "ui/views/controls/textfield/textfield.h"
@@ skipping 45 matching lines @@
     MENU_IMAGE_GRID(IDR_COMBOBOX_BUTTON_F_H);
 const int kFocusedPressedMenuButtonImages[] =
     MENU_IMAGE_GRID(IDR_COMBOBOX_BUTTON_F_P);
 
 #undef MENU_IMAGE_GRID
 
 bool UseMd() {
   return ui::MaterialDesignController::IsSecondaryUiMaterial();
 }
 
+SkColor GetTextColorForEnableState(bool enabled, ui::NativeTheme* theme) {
+  return style::GetColor(style::CONTEXT_TEXTFIELD,
+                         enabled ? style::STYLE_PRIMARY : style::STYLE_DISABLED,
+                         theme);
+}
+
 gfx::Rect PositionArrowWithinContainer(const gfx::Rect& container_bounds,
                                        const gfx::Size& arrow_size,
                                        Combobox::Style style) {
   gfx::Rect bounds(container_bounds);
   if (style == Combobox::STYLE_ACTION) {
     // This positions the arrow horizontally. The later call to
     // ClampToCenteredSize will position it vertically without touching the
     // horizontal position.
     bounds.Inset(kActionLeftPadding, 0, kActionRightPadding, 0);
     DCHECK_EQ(bounds.width(), arrow_size.width());
@@ skipping 27 matching lines @@
     // platforms they do.
     parent()->RequestFocus();
 #endif
     return CustomButton::OnMousePressed(mouse_event);
   }
 
   double GetAnimationValue() const {
     return hover_animation().GetCurrentValue();
   }
 
-  // Overridden from InkDropHost:
+  // InkDropHost:
   std::unique_ptr<InkDrop> CreateInkDrop() override {
     std::unique_ptr<views::InkDropImpl> ink_drop = CreateDefaultInkDropImpl();
     ink_drop->SetShowHighlightOnHover(false);
     return std::move(ink_drop);
   }
 
   std::unique_ptr<InkDropRipple> CreateInkDropRipple() const override {
-    return std::unique_ptr<views::InkDropRipple>(
-        new views::FloodFillInkDropRipple(
-            size(), GetInkDropCenterBasedOnLastEvent(),
-            GetNativeTheme()->GetSystemColor(
-                ui::NativeTheme::kColorId_LabelEnabledColor),
-            ink_drop_visible_opacity()));
+    return CreateFloodFillInkDropRipple();
+  }
+
+  SkColor GetInkDropBaseColor() const override {
+    return GetNativeTheme()->GetSystemColor(
+        ui::NativeTheme::kColorId_LabelEnabledColor);
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TransparentButton);
 };
 
 #if !defined(OS_MACOSX)
 // Returns the next or previous valid index (depending on |increment|'s value).
 // Skips separator or disabled indices. Returns -1 if there is no valid adjacent
 // index.
@@ skipping 639 matching lines @@
 void Combobox::PaintText(gfx::Canvas* canvas) {
   gfx::Insets insets = GetInsets();
   insets += gfx::Insets(0, Textfield::kTextPadding, 0, Textfield::kTextPadding);
 
   gfx::ScopedCanvas scoped_canvas(canvas);
   canvas->ClipRect(GetContentsBounds());
 
   int x = insets.left();
   int y = insets.top();
   int text_height = height() - insets.height();
-  SkColor text_color = GetNativeTheme()->GetSystemColor(
-      UseMd() ? (enabled() ? ui::NativeTheme::kColorId_TextfieldDefaultColor
-                           : ui::NativeTheme::kColorId_TextfieldReadOnlyColor)
-              : (enabled() ? ui::NativeTheme::kColorId_LabelEnabledColor
-                           : ui::NativeTheme::kColorId_LabelDisabledColor));
-
+  SkColor text_color = GetTextColorForEnableState(enabled(), GetNativeTheme());
   DCHECK_GE(selected_index_, 0);
   DCHECK_LT(selected_index_, model()->GetItemCount());
   if (selected_index_ < 0 || selected_index_ > model()->GetItemCount())
     selected_index_ = 0;
   base::string16 text = model()->GetItemAt(selected_index_);
 
   int disclosure_arrow_offset = width() - GetArrowContainerWidth();
 
   const gfx::FontList& font_list = Combobox::GetFontList();
   int text_width = gfx::GetStringWidth(text, font_list);
@@ skipping 22 matching lines @@
     // This epsilon makes sure that all the aliasing pixels are slightly more
     // than half full. Otherwise, rounding issues cause some to be considered
     // slightly less than half full and come out a little lighter.
     const SkScalar kEpsilon = 0.0001f;
     path.moveTo(x - kEpsilon, y);
     path.rLineTo(height, height);
     path.rLineTo(2 * kEpsilon, 0);
     path.rLineTo(height, -height);
     path.close();
     cc::PaintFlags flags;
-    SkColor arrow_color = GetNativeTheme()->GetSystemColor(
-        ui::NativeTheme::kColorId_ButtonEnabledColor);
+    SkColor arrow_color = GetTextColorForEnableState(true, GetNativeTheme());
     if (!enabled())
       arrow_color = SkColorSetA(arrow_color, gfx::kDisabledControlAlpha);
     flags.setColor(arrow_color);
     flags.setAntiAlias(true);
     canvas->DrawPath(path, flags);
   } else {
     canvas->DrawImageInt(arrow_image_, arrow_bounds.x(), arrow_bounds.y());
   }
 }
 
@@ skipping 136 matching lines @@
   constexpr int kMdPaddingWidth = 8;
   constexpr int kNormalPaddingWidth = 7;
   int arrow_pad = UseMd() ? kMdPaddingWidth : kNormalPaddingWidth;
   int padding = style_ == STYLE_NORMAL
                     ? arrow_pad * 2
                     : kActionLeftPadding + kActionRightPadding;
   return ArrowSize().width() + padding;
 }
 
 }  // namespace views