Material Design: Fix MdLabelButton not updating text colors on theme changes

ui/views/controls/button/label_button.h

 // 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.
 
 #ifndef UI_VIEWS_CONTROLS_BUTTON_LABEL_BUTTON_H_
 #define UI_VIEWS_CONTROLS_BUTTON_LABEL_BUTTON_H_
 
+#include <array>
 #include <memory>
 
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/views/controls/button/custom_button.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
@@ skipping 125 matching lines @@
   // Updates the image view to contain the appropriate button state image.
   void UpdateImage();
 
   // Updates the border as per the NativeTheme, unless a different border was
   // set with SetBorder.
   void UpdateThemedBorder();
 
   // NativeThemeDelegate:
   gfx::Rect GetThemePaintRect() const override;
 
+  std::array<bool, STATE_COUNT> explicitly_set_colors() const {

[Evan Stade, 2017/01/09 20:02:30]

should this return a const ref

[Tom (Use chromium acct), 2017/01/09 20:31:50]

Done.

+    return explicitly_set_colors_;
+  }
+  void set_explicitly_set_colors(std::array<bool, STATE_COUNT> colors) {

[Evan Stade, 2017/01/09 20:02:30]

const ref

[Tom (Use chromium acct), 2017/01/09 20:31:50]

Done.

+    explicitly_set_colors_ = colors;
+  }
+
  private:
   FRIEND_TEST_ALL_PREFIXES(LabelButtonTest, Init);
   FRIEND_TEST_ALL_PREFIXES(LabelButtonTest, Label);
   FRIEND_TEST_ALL_PREFIXES(LabelButtonTest, Image);
   FRIEND_TEST_ALL_PREFIXES(LabelButtonTest, LabelAndImage);
   FRIEND_TEST_ALL_PREFIXES(LabelButtonTest, FontList);
   FRIEND_TEST_ALL_PREFIXES(LabelButtonTest, ResetColorsFromNativeTheme);
 
   void SetTextInternal(const base::string16& text);
 
@@ skipping 34 matching lines @@
 
   // The cached font lists in the normal and bold style.
   gfx::FontList cached_normal_font_list_;
   gfx::FontList cached_bold_font_list_;
 
   // The images and colors for each button state.
   gfx::ImageSkia button_state_images_[STATE_COUNT];
   SkColor button_state_colors_[STATE_COUNT];
 
   // Used to track whether SetTextColor() has been invoked.
-  bool explicitly_set_colors_[STATE_COUNT];
+  std::array<bool, STATE_COUNT> explicitly_set_colors_;
 
   // |min_size_| increases monotonically with the preferred size.
   mutable gfx::Size min_size_;
   // |max_size_| may be set to clamp the preferred size.
   gfx::Size max_size_;
 
   // Cache the last computed preferred size.
   mutable gfx::Size cached_preferred_size_;
   mutable bool cached_preferred_size_valid_;
 
@@ skipping 18 matching lines @@
   gfx::HorizontalAlignment horizontal_alignment_;
 
   std::unique_ptr<Painter> focus_painter_;
 
   DISALLOW_COPY_AND_ASSIGN(LabelButton);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_CONTROLS_BUTTON_LABEL_BUTTON_H_