fix text color of BlueButton on GTK-theme-mode Linux Aura.

ui/views/controls/button/label_button.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/button/label_button.h"
 
 #include "base/logging.h"
 #include "grit/ui_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/animation/throb_animation.h"
@@ skipping 347 matching lines @@
 void LabelButton::UpdateThemedBorder() {
   // Don't override borders set by others.
   if (!border_is_themed_border_)
     return;
 
   scoped_ptr<Border> label_button_border = CreateDefaultBorder();
 
 #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()));
+    // If we're using a system-themed border, make sure the text is legible.
+    label_->SetAutoColorReadabilityEnabled(border() != default_border);

[msw, 2014/05/29 19:52:23]

Should the label background color be initialized here? It only happens on
StateChanged for Linux Desktop, and otherwise this readability behavior might
use some default/uninitialized value. In testing, this seems to only apply
"readable" colors to the normal state after a hover.

   } else
 #endif
   {
     SetBorder(label_button_border.Pass());
   }
 
   border_is_themed_border_ = true;
 }
 
 void LabelButton::StateChanged() {
+  if (border_is_themed_border_) {
+    label_->SetBackgroundColor(GetNativeTheme()->GetSystemColor(

[msw, 2014/05/29 02:03:55]

Does this work right if gfx::IsInvertedColorScheme() adds a visible solid black
background to the button? (maybe that doesn't happen at all on Linux?)

[Evan Stade, 2014/05/29 19:04:45]

Do I need a Windows machine to test that? Is the bg black even when hovered for
inverted color schemes? Why are the inverted colors not piped through the
nativetheme?

I guess I can guard this with !gfx::IsInvertedColorScheme().

[msw, 2014/05/29 19:52:23]

Yeah, IsInvertedColorScheme is only supported on Windows for now, but I tested
this for you.
Yes, we draw a black rectangle under the label (but not covering the whole
button), regardless of the button state, so that the text is readable to those
with visibility needs.
The inverted color scheme support and design is abysmal and needs an overhaul,
along with the pattern of painting image assets here, rather than through
NativeTheme. We already need a LabelButton 2.0 :(
Yes, your CL as-is breaks the normal state text color for the Windows High
Contrast Black system theme (but only after the initial hover; see my other CL
comment above). Simply adding a !gfx::IsInvertedColorScheme() condition here
would be appropriate for now (it prevents the breakage this would otherwise
introduce).

+        state() == STATE_HOVERED ?
+            ui::NativeTheme::kColorId_ButtonHoverBackgroundColor :
+            ui::NativeTheme::kColorId_ButtonBackgroundColor));
+  }
+
   const gfx::Size previous_image_size(image_->GetPreferredSize());
   UpdateImage();
   const SkColor color = button_state_colors_[state()];
   if (state() != STATE_DISABLED && label_->enabled_color() != color)
     label_->SetEnabledColor(color);
   label_->SetEnabled(state() != STATE_DISABLED);
   if (image_->GetPreferredSize() != previous_image_size)
     Layout();
 }
 
@@ skipping 39 matching lines @@
   return ui::NativeTheme::kNormal;
 }
 
 ui::NativeTheme::State LabelButton::GetForegroundThemeState(
     ui::NativeTheme::ExtraParams* params) const {
   GetExtraParams(params);
   return ui::NativeTheme::kHovered;
 }
 
 }  // namespace views