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

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

Issue 2793283002: Remove LabelButton::SetFontListDeprecated(). (Closed)
Patch Set: Created 3 years, 8 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 | « ui/views/controls/button/label_button.h ('k') | no next file » | 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 #include "ui/views/controls/button/label_button.h" 5 #include "ui/views/controls/button/label_button.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <utility> 9 #include <utility>
10 10
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 } 152 }
153 153
154 void LabelButton::SetTextShadows(const gfx::ShadowValues& shadows) { 154 void LabelButton::SetTextShadows(const gfx::ShadowValues& shadows) {
155 label_->SetShadows(shadows); 155 label_->SetShadows(shadows);
156 } 156 }
157 157
158 void LabelButton::SetTextSubpixelRenderingEnabled(bool enabled) { 158 void LabelButton::SetTextSubpixelRenderingEnabled(bool enabled) {
159 label_->SetSubpixelRenderingEnabled(enabled); 159 label_->SetSubpixelRenderingEnabled(enabled);
160 } 160 }
161 161
162 void LabelButton::SetFontListDeprecated(const gfx::FontList& font_list) {
163 SetFontList(font_list);
164 }
165
166 void LabelButton::AdjustFontSize(int font_size_delta) { 162 void LabelButton::AdjustFontSize(int font_size_delta) {
167 LabelButton::SetFontList( 163 LabelButton::SetFontList(
168 label()->font_list().DeriveWithSizeDelta(font_size_delta)); 164 label()->font_list().DeriveWithSizeDelta(font_size_delta));
169 } 165 }
170 166
171 void LabelButton::SetElideBehavior(gfx::ElideBehavior elide_behavior) { 167 void LabelButton::SetElideBehavior(gfx::ElideBehavior elide_behavior) {
172 label_->SetElideBehavior(elide_behavior); 168 label_->SetElideBehavior(elide_behavior);
173 } 169 }
174 170
175 void LabelButton::SetHorizontalAlignment(gfx::HorizontalAlignment alignment) { 171 void LabelButton::SetHorizontalAlignment(gfx::HorizontalAlignment alignment) {
(...skipping 428 matching lines...) Expand 10 before | Expand all | Expand 10 after
604 : PlatformStyle::TextColorForButton(button_state_colors_, *this); 600 : PlatformStyle::TextColorForButton(button_state_colors_, *this);
605 if (state() != STATE_DISABLED && label_->enabled_color() != color) 601 if (state() != STATE_DISABLED && label_->enabled_color() != color)
606 label_->SetEnabledColor(color); 602 label_->SetEnabledColor(color);
607 } 603 }
608 604
609 bool LabelButton::UseFloodFillInkDrop() const { 605 bool LabelButton::UseFloodFillInkDrop() const {
610 return !GetText().empty(); 606 return !GetText().empty();
611 } 607 }
612 608
613 } // namespace views 609 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/controls/button/label_button.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698