MD-ify textfields and combobox.

ui/native_theme/common_theme.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/native_theme/common_theme.h"
 
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "ui/base/material_design/material_design_controller.h"
@@ skipping 83 matching lines @@
       case NativeTheme::kColorId_ResultsTableNegativeText:
       case NativeTheme::kColorId_ResultsTableNegativeHoveredText:
       case NativeTheme::kColorId_ResultsTableNegativeSelectedText:
         return kNegativeTextColorMd;
 
       default:
         break;
     }
   }
 
+  if (ui::MaterialDesignController::IsSecondaryUiMaterial()) {
+    switch (color_id) {
+      // FocusableBorder
+      case NativeTheme::kColorId_FocusedBorderColor:
+        return gfx::kGoogleBlue500;
+      case NativeTheme::kColorId_UnfocusedBorderColor:
+        return SkColorSetA(SK_ColorBLACK, 0x66);
+
+      default:
+        break;
+    }
+  }
+
   // Pre-MD colors.
   // Windows:
   static const SkColor kWindowBackgroundColor = SK_ColorWHITE;
   // Dialogs:
   static const SkColor kDialogBackgroundColor = SkColorSetRGB(251, 251, 251);
   // FocusableBorder:
   static const SkColor kFocusedBorderColor = SkColorSetRGB(0x4D, 0x90, 0xFE);
   static const SkColor kUnfocusedBorderColor = SkColorSetRGB(0xD9, 0xD9, 0xD9);
   // Button:
   static const SkColor kButtonBackgroundColor = SkColorSetRGB(0xDE, 0xDE, 0xDE);
@@ skipping 315 matching lines @@
   }
   if (menu_item.corner_radius > 0) {
     const SkScalar radius = SkIntToScalar(menu_item.corner_radius);
     canvas->drawRoundRect(gfx::RectToSkRect(rect), radius, radius, paint);
     return;
   }
   canvas->drawRect(gfx::RectToSkRect(rect), paint);
 }
 
 }  // namespace ui