Revert of retry r266042:

ui/views/controls/label.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_LABEL_H_
 #define UI_VIEWS_CONTROLS_LABEL_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 226 matching lines @@
 
   int ComputeDrawStringFlags() const;
 
   gfx::Rect GetAvailableRect() const;
 
   // Returns parameters to be used for the DrawString call.
   void CalculateDrawStringParams(base::string16* paint_text,
                                  gfx::Rect* text_bounds,
                                  int* flags) const;
 
+  // Updates any colors that have not been explicitly set from the theme.
+  void UpdateColorsFromTheme(const ui::NativeTheme* theme);
+
   // Resets |cached_heights_| and |cached_heights_cursor_| and mark
   // |text_size_valid_| as false.
   void ResetCachedSize();
 
   bool ShouldShowDefaultTooltip() const;
 
   base::string16 text_;
   base::string16 layout_text_;
   gfx::FontList font_list_;
   SkColor requested_enabled_color_;
@@ skipping 39 matching lines @@
   // The cached heights to avoid recalculation in GetHeightForWidth().
   std::vector<gfx::Size> cached_heights_;
   int cached_heights_cursor_;
 
   DISALLOW_COPY_AND_ASSIGN(Label);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_CONTROLS_LABEL_H_