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

Unified Diff: ui/views/controls/button/label_button.cc

Issue 288983010: fix text color of BlueButton on GTK-theme-mode Linux Aura. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 months 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/button/label_button.cc
diff --git a/ui/views/controls/button/label_button.cc b/ui/views/controls/button/label_button.cc
index fd9d5641d5e38fca453140e5d9bbd386092723fb..55b39ebf0441347c10ffc38f62884e25698760f9 100644
--- a/ui/views/controls/button/label_button.cc
+++ b/ui/views/controls/button/label_button.cc
@@ -365,7 +365,12 @@ void LabelButton::UpdateThemedBorder() {
#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
views::LinuxUI* linux_ui = views::LinuxUI::instance();
if (linux_ui) {
+ Border* default_border = label_button_border.get();
SetBorder(linux_ui->CreateNativeBorder(this, label_button_border.Pass()));
+ label_->SetBackgroundColor(GetNativeTheme()->GetSystemColor(
+ ui::NativeTheme::kColorId_ButtonBackgroundColor));
+ // If we're using a system-themed border, make sure text is legible.
+ label_->SetAutoColorReadabilityEnabled(border() != default_border);
Elliot Glaysher 2014/05/23 21:07:01 Do we want to be executing all this outside of Blu
Evan Stade 2014/05/23 23:39:53 I guess I get why you're asking -- because normal
} else
#endif
{
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698