Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(403)

Side by Side Diff: ui/views/controls/button/label_button.h

Issue 2111323003: Turn off the auto color readability of LabelButton in non-high contrast mode (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add a test for this CL Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | ui/views/controls/button/label_button.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef UI_VIEWS_CONTROLS_BUTTON_LABEL_BUTTON_H_ 5 #ifndef UI_VIEWS_CONTROLS_BUTTON_LABEL_BUTTON_H_
6 #define UI_VIEWS_CONTROLS_BUTTON_LABEL_BUTTON_H_ 6 #define UI_VIEWS_CONTROLS_BUTTON_LABEL_BUTTON_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 147
148 // NativeThemeDelegate: 148 // NativeThemeDelegate:
149 gfx::Rect GetThemePaintRect() const override; 149 gfx::Rect GetThemePaintRect() const override;
150 150
151 private: 151 private:
152 FRIEND_TEST_ALL_PREFIXES(LabelButtonTest, Init); 152 FRIEND_TEST_ALL_PREFIXES(LabelButtonTest, Init);
153 FRIEND_TEST_ALL_PREFIXES(LabelButtonTest, Label); 153 FRIEND_TEST_ALL_PREFIXES(LabelButtonTest, Label);
154 FRIEND_TEST_ALL_PREFIXES(LabelButtonTest, Image); 154 FRIEND_TEST_ALL_PREFIXES(LabelButtonTest, Image);
155 FRIEND_TEST_ALL_PREFIXES(LabelButtonTest, LabelAndImage); 155 FRIEND_TEST_ALL_PREFIXES(LabelButtonTest, LabelAndImage);
156 FRIEND_TEST_ALL_PREFIXES(LabelButtonTest, FontList); 156 FRIEND_TEST_ALL_PREFIXES(LabelButtonTest, FontList);
157 FRIEND_TEST_ALL_PREFIXES(LabelButtonTest, ResetColorsFromNativeTheme);
157 158
158 void SetTextInternal(const base::string16& text); 159 void SetTextInternal(const base::string16& text);
159 160
160 // View: 161 // View:
161 void ChildPreferredSizeChanged(View* child) override; 162 void ChildPreferredSizeChanged(View* child) override;
162 163
163 // NativeThemeDelegate: 164 // NativeThemeDelegate:
164 ui::NativeTheme::Part GetThemePart() const override; 165 ui::NativeTheme::Part GetThemePart() const override;
165 ui::NativeTheme::State GetThemeState( 166 ui::NativeTheme::State GetThemeState(
166 ui::NativeTheme::ExtraParams* params) const override; 167 ui::NativeTheme::ExtraParams* params) const override;
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
229 gfx::HorizontalAlignment horizontal_alignment_; 230 gfx::HorizontalAlignment horizontal_alignment_;
230 231
231 std::unique_ptr<Painter> focus_painter_; 232 std::unique_ptr<Painter> focus_painter_;
232 233
233 DISALLOW_COPY_AND_ASSIGN(LabelButton); 234 DISALLOW_COPY_AND_ASSIGN(LabelButton);
234 }; 235 };
235 236
236 } // namespace views 237 } // namespace views
237 238
238 #endif // UI_VIEWS_CONTROLS_BUTTON_LABEL_BUTTON_H_ 239 #endif // UI_VIEWS_CONTROLS_BUTTON_LABEL_BUTTON_H_
OLDNEW
« no previous file with comments | « no previous file | ui/views/controls/button/label_button.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698