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

Side by Side Diff: ui/views/controls/link.h

Issue 2910153002: Remove views::Label::SetDisabledColor(). Replace with typography colors. (Closed)
Patch Set: rebase for r476345 Created 3 years, 6 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
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_LINK_H_ 5 #ifndef UI_VIEWS_CONTROLS_LINK_H_
6 #define UI_VIEWS_CONTROLS_LINK_H_ 6 #define UI_VIEWS_CONTROLS_LINK_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 82
83 private: 83 private:
84 void Init(); 84 void Init();
85 85
86 void SetPressed(bool pressed); 86 void SetPressed(bool pressed);
87 87
88 void RecalculateFont(); 88 void RecalculateFont();
89 89
90 void ConfigureFocus(); 90 void ConfigureFocus();
91 91
92 SkColor GetEnabledColor(); 92 SkColor GetColor();
93 SkColor GetPressedColor();
94 93
95 LinkListener* listener_; 94 LinkListener* listener_;
96 95
97 // Whether the link should be underlined when enabled. 96 // Whether the link should be underlined when enabled.
98 bool underline_; 97 bool underline_;
99 98
100 // Whether the link is currently pressed. 99 // Whether the link is currently pressed.
101 bool pressed_; 100 bool pressed_;
102 101
103 // The color when the link is neither pressed nor disabled. 102 // The color when the link is neither pressed nor disabled.
104 SkColor requested_enabled_color_; 103 SkColor requested_enabled_color_;
105 bool requested_enabled_color_set_; 104 bool requested_enabled_color_set_;
106 105
107 // The color when the link is pressed.
108 SkColor requested_pressed_color_;
109 bool requested_pressed_color_set_;
110
111 DISALLOW_COPY_AND_ASSIGN(Link); 106 DISALLOW_COPY_AND_ASSIGN(Link);
112 }; 107 };
113 108
114 } // namespace views 109 } // namespace views
115 110
116 #endif // UI_VIEWS_CONTROLS_LINK_H_ 111 #endif // UI_VIEWS_CONTROLS_LINK_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698