Remove IsModeMaterial checks in ui/views/

ui/views/controls/link.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/link.h"
 
 #include "build/build_config.h"
 
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 12 matching lines @@
 
 namespace views {
 
 const char Link::kViewClassName[] = "Link";
 
 Link::Link() : Link(base::string16()) {}
 
 Link::Link(const base::string16& title)
     : Label(title),
       requested_enabled_color_(gfx::kPlaceholderColor),
-      requested_enabled_color_set_(false),
-      requested_pressed_color_(gfx::kPlaceholderColor),
-      requested_pressed_color_set_(false) {
+      requested_enabled_color_set_(false) {
   Init();
 }
 
 Link::~Link() {
 }
 
 const char* Link::GetClassName() const {
   return kViewClassName;
 }
 
@@ skipping 123 matching lines @@
   SetDisabledColor(
       theme->GetSystemColor(ui::NativeTheme::kColorId_LinkDisabled));
 }
 
 void Link::SetEnabledColor(SkColor color) {
   requested_enabled_color_set_ = true;
   requested_enabled_color_ = color;
   Label::SetEnabledColor(GetEnabledColor());
 }
 
-void Link::SetPressedColor(SkColor color) {
-  requested_pressed_color_set_ = true;
-  requested_pressed_color_ = color;
-  Label::SetEnabledColor(GetEnabledColor());
-}
-
 void Link::SetUnderline(bool underline) {
   if (underline_ == underline)
     return;
   underline_ = underline;
   RecalculateFont();
 }
 
 void Link::Init() {
   listener_ = NULL;
   pressed_ = false;
@@ skipping 39 matching lines @@
   } else {
 #if defined(OS_MACOSX)
     SetFocusBehavior(FocusBehavior::ACCESSIBLE_ONLY);
 #else
     SetFocusBehavior(FocusBehavior::ALWAYS);
 #endif
   }
 }
 
 SkColor Link::GetEnabledColor() {
-  // In material mode, there is no pressed effect, so always use the unpressed
-  // color.
-  if (!pressed_ || ui::MaterialDesignController::IsModeMaterial()) {
-    if (!requested_enabled_color_set_ && GetNativeTheme())
-      return GetNativeTheme()->GetSystemColor(
-          ui::NativeTheme::kColorId_LinkEnabled);
+  if (requested_enabled_color_set_)

[Evan Stade, 2016/09/30 22:57:38]

here is a behavior change.

The default NativeTheme uses the same color for pressed and normal, but the GTK
native theme uses a different color for pressed. This restores that distinction
which was at some point papered over. Non-GTK themes should not be affected.

+    return requested_enabled_color_;
 
-    return requested_enabled_color_;
+  if (GetNativeTheme()) {
+    return GetNativeTheme()->GetSystemColor(
+        pressed_ ? ui::NativeTheme::kColorId_LinkPressed
+                 : ui::NativeTheme::kColorId_LinkEnabled);
   }
 
-  if (!requested_pressed_color_set_ && GetNativeTheme())
-    return GetNativeTheme()->GetSystemColor(
-        ui::NativeTheme::kColorId_LinkPressed);
-
-  return requested_pressed_color_;
+  return gfx::kPlaceholderColor;
 }
 
 }  // namespace views