[Views] Only paint background of text portion of LabelButton in inverted color theme.

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"
+#include "ui/gfx/canvas.h"
 #include "ui/gfx/font_list.h"
 #include "ui/gfx/sys_color_change_listener.h"
 #include "ui/native_theme/native_theme.h"
+#include "ui/views/background.h"
 #include "ui/views/controls/button/label_button_border.h"
 #include "ui/views/painter.h"
 #include "ui/views/window/dialog_delegate.h"
 
 #if defined(OS_WIN)
 #include "ui/native_theme/native_theme_win.h"
 #endif
 
 namespace {
 
@@ skipping 244 matching lines @@
   image_->SetBoundsRect(gfx::Rect(image_origin, image_size));
   label_->SetBoundsRect(gfx::Rect(label_origin, label_size));
 }
 
 const char* LabelButton::GetClassName() const {
   return kViewClassName;
 }
 
 void LabelButton::OnPaint(gfx::Canvas* canvas) {
   View::OnPaint(canvas);
+

[msw, 2014/01/07 00:00:54]

nit: remove blank line

[Greg Billock, 2014/01/07 17:29:58]

Done.

   Painter::PaintFocusPainter(this, canvas, focus_painter_.get());
 }
 
 void LabelButton::OnFocus() {
   View::OnFocus();
   // Typically the border renders differently when focused.
   SchedulePaint();
 }
 
 void LabelButton::OnBlur() {
   View::OnBlur();
   // Typically the border renders differently when focused.
   SchedulePaint();
 }
 
 void LabelButton::GetExtraParams(ui::NativeTheme::ExtraParams* params) const {
   params->button.checked = false;
   params->button.indeterminate = false;
   params->button.is_default = is_default_;
   params->button.is_focused = HasFocus() && IsAccessibilityFocusable();
   params->button.has_border = style() == STYLE_NATIVE_TEXTBUTTON;
   params->button.classic_state = 0;
-  params->button.background_color = label()->background_color();
+  params->button.background_color = label_->background_color();
 }
 
 void LabelButton::ResetColorsFromNativeTheme() {
   const ui::NativeTheme* theme = GetNativeTheme();
   SkColor colors[STATE_COUNT] = {
     theme->GetSystemColor(ui::NativeTheme::kColorId_ButtonEnabledColor),
     theme->GetSystemColor(ui::NativeTheme::kColorId_ButtonHoverColor),
     theme->GetSystemColor(ui::NativeTheme::kColorId_ButtonHoverColor),
     theme->GetSystemColor(ui::NativeTheme::kColorId_ButtonDisabledColor),
   };
 
   // Certain styles do not change text color when hovered or pressed.
   bool constant_text_color = false;
 #if defined(OS_WIN)
   constant_text_color |= (style() == STYLE_NATIVE_TEXTBUTTON &&
                           theme == ui::NativeThemeWin::instance());
 #endif
 
   // Use hardcoded colors for inverted color scheme support and STYLE_BUTTON.
   if (gfx::IsInvertedColorScheme()) {
     constant_text_color = true;
     colors[STATE_NORMAL] = SK_ColorWHITE;
     label_->SetBackgroundColor(SK_ColorBLACK);
+    label_->set_background(Background::CreateSolidBackground(SK_ColorBLACK));
     label_->SetAutoColorReadabilityEnabled(true);
     label_->ClearEmbellishing();
   } else if (style() == STYLE_BUTTON) {
     constant_text_color = true;
     colors[STATE_NORMAL] = kStyleButtonTextColor;
     label_->SetBackgroundColor(theme->GetSystemColor(
         ui::NativeTheme::kColorId_ButtonBackgroundColor));
+    label_->set_background(NULL);
     label_->SetAutoColorReadabilityEnabled(false);
     label_->SetShadowColors(kStyleButtonShadowColor, kStyleButtonShadowColor);
     label_->SetShadowOffset(0, 1);
+  } else {
+    label_->set_background(NULL);
   }
 
   if (constant_text_color)
     colors[STATE_HOVERED] = colors[STATE_PRESSED] = colors[STATE_NORMAL];
 
   for (size_t state = STATE_NORMAL; state < STATE_COUNT; ++state) {
     if (!explicitly_set_colors_[state]) {
       SetTextColor(static_cast<ButtonState>(state), colors[state]);
       explicitly_set_colors_[state] = false;
     }
@@ skipping 61 matching lines @@
   return ui::NativeTheme::kNormal;
 }
 
 ui::NativeTheme::State LabelButton::GetForegroundThemeState(
     ui::NativeTheme::ExtraParams* params) const {
   GetExtraParams(params);
   return ui::NativeTheme::kHovered;
 }
 
 }  // namespace views