Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(529)

Unified Diff: ui/views/controls/link.cc

Issue 1461923002: Change name of NativeTheme::instance() to make it clear it's web only. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: NATIVE_THEME_EXPORT for mac Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/views/controls/label.cc ('k') | ui/views/controls/menu/menu_config_aura.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/link.cc
diff --git a/ui/views/controls/link.cc b/ui/views/controls/link.cc
index 372a4f1dc3c01b2e81e858bd3e27249a2f3cabb2..adbe647aaf4d8262619a736437f27da376fd18f0 100644
--- a/ui/views/controls/link.cc
+++ b/ui/views/controls/link.cc
@@ -14,6 +14,7 @@
#include "ui/events/event.h"
#include "ui/events/keycodes/keyboard_codes.h"
#include "ui/gfx/canvas.h"
+#include "ui/gfx/color_palette.h"
#include "ui/gfx/color_utils.h"
#include "ui/gfx/font_list.h"
#include "ui/native_theme/native_theme.h"
@@ -24,20 +25,13 @@ namespace views {
const char Link::kViewClassName[] = "Link";
-Link::Link()
- : Label(base::string16()),
- requested_enabled_color_(SK_ColorBLACK),
- requested_enabled_color_set_(false),
- requested_pressed_color_(SK_ColorBLACK),
- requested_pressed_color_set_(false) {
- Init();
-}
+Link::Link() : Link(base::string16()) {}
Link::Link(const base::string16& title)
: Label(title),
- requested_enabled_color_(SK_ColorBLACK),
+ requested_enabled_color_(gfx::kPlaceholderColor),
requested_enabled_color_set_(false),
- requested_pressed_color_(SK_ColorBLACK),
+ requested_pressed_color_(gfx::kPlaceholderColor),
requested_pressed_color_set_(false) {
Init();
}
« no previous file with comments | « ui/views/controls/label.cc ('k') | ui/views/controls/menu/menu_config_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698