[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/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
@@ skipping 247 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);
+
+  if (gfx::IsInvertedColorScheme())

[sky, 2014/01/06 20:20:37]

This ends up being after the border is painted. Don't we want this in
LabelButton::OnPaintBackground? Or possibly set as a Background?

[Greg Billock, 2014/01/06 21:13:44]

I placed this here to try and mimic the sequencing from where it was in the
LabelButtonBorder paint order. Having it as a background would paint before the
border. That's possibly better; I was aiming for conservativeness in this patch,
and also thought that since this isn't edge-to-edge it might be unexpected in
either a background or a border. Accomplishing the goal by setting something on
the label_ itself might be an answer, but that's a bit more invasive...

[msw, 2014/01/06 21:50:57]

Do label_->set_background(CreateSolidBackground(SK_ColorBLACK)) on line 329.

[Greg Billock, 2014/01/06 22:14:46]

That's true, we're kind of already pushing the label around in this case. Is
that going to mess anything up? If not, let's just do that.

[msw, 2014/01/06 22:34:55]

Neither Label nor LabelButton seem to set any background on this label view, so
that suggestion should work okay. My only other suggestion is to
set_background(NULL) (clear any black background) when
ResetColorsFromNativeTheme is called and gfx::IsInvertedColorScheme() is false.

[Greg Billock, 2014/01/06 23:51:02]

ok. This seems to work fine.*

* There are still a couple oddities. The omnibox in HC theme is editing
strangely -- doesn't look like it repaints background after theme change. Same
thing looks like it goes for buttons -- they aren't repainting successfully, but
closing and opening the browser succeeds. I'm guessing this may be lower down in
the stack?

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

Yeah, I think these are long-standing issues; many views need to similarly
ResetColorsFromNativeTheme on theme changes and aren't doing so. As long as
everything looks correct when re-launching the browser after a theme change,
it'll be acceptable for now.

+    canvas->FillRect(label_->bounds(), label_->background_color());
+
   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),
   };
@@ skipping 94 matching lines @@
   return ui::NativeTheme::kNormal;
 }
 
 ui::NativeTheme::State LabelButton::GetForegroundThemeState(
     ui::NativeTheme::ExtraParams* params) const {
   GetExtraParams(params);
   return ui::NativeTheme::kHovered;
 }
 
 }  // namespace views