More Harmony combobox/textfield updates:

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>
 
@@ skipping 388 matching lines @@
       size_to_largest_label_(style_ == STYLE_NORMAL),
       weak_ptr_factory_(this) {
   ModelChanged();
 #if defined(OS_MACOSX)
   SetFocusBehavior(FocusBehavior::ACCESSIBLE_ONLY);
 #else
   SetFocusBehavior(FocusBehavior::ALWAYS);
 #endif
 
   UpdateBorder();
-  // set_background() takes ownership but takes a raw pointer.
-  std::unique_ptr<Background> b =
-      PlatformStyle::CreateComboboxBackground(GetArrowContainerWidth());
-  set_background(b.release());
+  if (UseMd()) {
+    // set_background() takes ownership but takes a raw pointer.
+    std::unique_ptr<Background> b =
+        PlatformStyle::CreateComboboxBackground(GetArrowContainerWidth());
+    set_background(b.release());
+  }
 
   // Initialize the button images.
   Button::ButtonState button_states[] = {
     Button::STATE_DISABLED,
     Button::STATE_NORMAL,
     Button::STATE_HOVERED,
     Button::STATE_PRESSED,
   };
   for (int i = 0; i < 2; i++) {
     for (size_t state_index = 0; state_index < arraysize(button_states);
@@ skipping 107 matching lines @@
     }
   }
 
   int arrow_button_x = std::max(0, text_button_width);
   text_button_->SetBounds(0, 0, std::max(0, text_button_width), height());
   arrow_button_->SetBounds(arrow_button_x, 0, arrow_button_width, height());
 }
 
 void Combobox::OnEnabledChanged() {
   View::OnEnabledChanged();
-  arrow_image_ = PlatformStyle::CreateComboboxArrow(enabled(), style_);
+  if (!UseMd())
+    arrow_image_ = PlatformStyle::CreateComboboxArrow(enabled(), style_);
+}
+
+void Combobox::OnNativeThemeChanged(const ui::NativeTheme* theme) {
+  if (!UseMd())
+    return;
+
+  set_background(Background::CreateBackgroundPainter(
+      true, Painter::CreateSolidRoundRectPainter(
+                theme->GetSystemColor(
+                    ui::NativeTheme::kColorId_TextfieldDefaultBackground),
+                FocusableBorder::kCornerRadiusDp)));
 }
 
 int Combobox::GetRowCount() {
   return model()->GetItemCount();
 }
 
 int Combobox::GetSelectedRow() {
   return selected_index_;
 }
 
@@ skipping 212 matching lines @@
   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(
-      enabled() ? ui::NativeTheme::kColorId_LabelEnabledColor :
-                  ui::NativeTheme::kColorId_LabelDisabledColor);
+      UseMd() ? (enabled() ? ui::NativeTheme::kColorId_TextfieldDefaultColor
+                           : ui::NativeTheme::kColorId_TextfieldReadOnlyColor)
+              : (enabled() ? ui::NativeTheme::kColorId_LabelEnabledColor
+                           : ui::NativeTheme::kColorId_LabelDisabledColor));
 
   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();
@@ skipping 23 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();
     SkPaint paint;
-    paint.setColor(GetNativeTheme()->GetSystemColor(
-        ui::NativeTheme::kColorId_ButtonEnabledColor));
+    SkColor arrow_color = GetNativeTheme()->GetSystemColor(
+        ui::NativeTheme::kColorId_ButtonEnabledColor);
+    // TODO(estade): share this disabled alpha value with other places that use
+    // it.
+    if (!enabled())
+      arrow_color = SkColorSetA(arrow_color, 0x61);
+    paint.setColor(arrow_color);
     paint.setAntiAlias(true);
     canvas->DrawPath(path, paint);
   } else {
     canvas->DrawImageInt(arrow_image_, arrow_bounds.x(), arrow_bounds.y());
   }
 }
 
 void Combobox::PaintButtons(gfx::Canvas* canvas) {
   DCHECK(style_ == STYLE_ACTION);
 
@@ skipping 138 matching lines @@
 }
 
 int Combobox::GetArrowContainerWidth() const {
   int padding = style_ == STYLE_NORMAL
                     ? PlatformStyle::kComboboxNormalArrowPadding * 2
                     : kActionLeftPadding + kActionRightPadding;
   return ArrowSize().width() + padding;
 }
 
 }  // namespace views