Update appearance of invalid textfields in Harmony.

ui/views/controls/focusable_border.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/focusable_border.h"
 
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/core/SkPath.h"
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/geometry/insets.h"
 #include "ui/gfx/scoped_canvas.h"
 #include "ui/gfx/skia_util.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/views/controls/textfield/textfield.h"
 
 namespace {
 
 const int kInsetSize = 1;
 
 }  // namespace
 
 namespace views {
 
-FocusableBorder::FocusableBorder()
-    : insets_(kInsetSize, kInsetSize, kInsetSize, kInsetSize),
-      override_color_(gfx::kPlaceholderColor),
-      use_default_color_(true) {
-}
+FocusableBorder::FocusableBorder() : insets_(kInsetSize) {}
 
 FocusableBorder::~FocusableBorder() {
 }
 
-void FocusableBorder::SetColor(SkColor color) {
-  override_color_ = color;
-  use_default_color_ = false;
-}
-
-void FocusableBorder::UseDefaultColor() {
-  use_default_color_ = true;
+void FocusableBorder::SetColorId(
+    const base::Optional<ui::NativeTheme::ColorId>& color_id) {
+  override_color_id_ = color_id;
 }
 
 void FocusableBorder::Paint(const View& view, gfx::Canvas* canvas) {
   // In harmony, the focus indicator is a FocusRing.
   if (ui::MaterialDesignController::IsSecondaryUiMaterial() && view.HasFocus())
     return;
 
   SkPaint paint;
   paint.setStyle(SkPaint::kStroke_Style);
   paint.setColor(GetCurrentColor(view));
@@ skipping 27 matching lines @@
 
 gfx::Size FocusableBorder::GetMinimumSize() const {
   return gfx::Size();
 }
 
 void FocusableBorder::SetInsets(int top, int left, int bottom, int right) {
   insets_.Set(top, left, bottom, right);
 }
 
 SkColor FocusableBorder::GetCurrentColor(const View& view) const {
-  if (!use_default_color_)
-    return override_color_;
+  ui::NativeTheme::ColorId color_id =
+      ui::NativeTheme::kColorId_UnfocusedBorderColor;
+  if (override_color_id_)
+    color_id = *override_color_id_;
+  else if (view.HasFocus())
+    color_id = ui::NativeTheme::kColorId_FocusedBorderColor;
 
-  SkColor color = view.GetNativeTheme()->GetSystemColor(
-      view.HasFocus() ? ui::NativeTheme::kColorId_FocusedBorderColor :
-                        ui::NativeTheme::kColorId_UnfocusedBorderColor);
+  SkColor color = view.GetNativeTheme()->GetSystemColor(color_id);
   if (ui::MaterialDesignController::IsSecondaryUiMaterial() &&
       !view.enabled()) {
     return color_utils::BlendTowardOppositeLuma(color,
                                                 gfx::kDisabledControlAlpha);
   }
-
   return color;
 }
 
 }  // namespace views