Update Harmony textfield and combobox default border color.

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"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/skia_util.h"
 #include "ui/resources/grit/ui_resources.h"
 
 namespace ui {
 
 SkColor GetAuraColor(NativeTheme::ColorId color_id,
                      const NativeTheme* base_theme) {
+  // Second wave of MD colors (colors that only appear in secondary UI).
+  if (ui::MaterialDesignController::IsSecondaryUiMaterial()) {
+    static const SkColor kPrimaryTextColor = SkColorSetRGB(0x33, 0x33, 0x33);
+
+    if (color_id == NativeTheme::kColorId_LabelEnabledColor)
+      return kPrimaryTextColor;
+    if (color_id == NativeTheme::kColorId_UnfocusedBorderColor)
+      return SkColorSetA(SK_ColorBLACK, 0x24);
+  }
+
   // MD colors.
   if (ui::MaterialDesignController::IsModeMaterial()) {
     // Dialogs:
     static const SkColor kDialogBackgroundColorMd = SK_ColorWHITE;
     // Buttons:
     static const SkColor kButtonEnabledColorMd = gfx::kChromeIconGrey;
     // MenuItem:
     static const SkColor kMenuHighlightBackgroundColorMd =
         SkColorSetARGB(0x14, 0x00, 0x00, 0x00);
     static const SkColor kSelectedMenuItemForegroundColorMd = SK_ColorBLACK;
@@ skipping 27 matching lines @@
 
       // Link
       case NativeTheme::kColorId_LinkEnabled:
       case NativeTheme::kColorId_LinkPressed:
         // Normal and pressed share a color.
         return kLinkEnabledColorMd;
 
       // FocusableBorder
       case NativeTheme::kColorId_FocusedBorderColor:
         return gfx::kGoogleBlue500;
+      // TODO(estade): I'm not sure why this one is here but it should be
+      // removed in favor of the value in the SecondaryUiMaterial block.
       case NativeTheme::kColorId_UnfocusedBorderColor:
         return SkColorSetA(SK_ColorBLACK, 0x66);
 
       // Results Tables
       case NativeTheme::kColorId_ResultsTableHoveredBackground:
         return SkColorSetA(base_theme->GetSystemColor(
                                NativeTheme::kColorId_ResultsTableNormalText),
                            0x0D);
       case NativeTheme::kColorId_ResultsTableSelectedBackground:
         return SkColorSetA(base_theme->GetSystemColor(
@@ skipping 16 matching lines @@
       case NativeTheme::kColorId_TooltipBackground:
         return kTooltipBackgroundMd;
       case NativeTheme::kColorId_TooltipText:
         return kTooltipTextColorMd;
 
       default:
         break;
     }
   }
 
-  // Second wave of MD colors (colors that only appear in secondary UI).
-  if (ui::MaterialDesignController::IsSecondaryUiMaterial()) {
-    static const SkColor kPrimaryTextColor = SkColorSetRGB(0x33, 0x33, 0x33);
-
-    if (color_id == NativeTheme::kColorId_LabelEnabledColor)
-      return kPrimaryTextColor;
-  }
-
   // 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 323 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