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

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

Issue 119273002: Clean-up: Retires obsolete methods in views::Label and views::TextButtonBase. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merged. Created 6 years, 11 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 | Annotate | Revision Log
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 "base/logging.h" 7 #include "base/logging.h"
8 #include "grit/ui_resources.h" 8 #include "grit/ui_resources.h"
9 #include "ui/base/resource/resource_bundle.h" 9 #include "ui/base/resource/resource_bundle.h"
10 #include "ui/gfx/animation/throb_animation.h" 10 #include "ui/gfx/animation/throb_animation.h"
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 } 103 }
104 104
105 const gfx::FontList& LabelButton::GetFontList() const { 105 const gfx::FontList& LabelButton::GetFontList() const {
106 return label_->font_list(); 106 return label_->font_list();
107 } 107 }
108 108
109 void LabelButton::SetFontList(const gfx::FontList& font_list) { 109 void LabelButton::SetFontList(const gfx::FontList& font_list) {
110 label_->SetFontList(font_list); 110 label_->SetFontList(font_list);
111 } 111 }
112 112
113 const gfx::Font& LabelButton::GetFont() const {
114 return label_->font();
115 }
116
117 void LabelButton::SetFont(const gfx::Font& font) {
118 label_->SetFont(font);
119 }
120
121 void LabelButton::SetElideBehavior(Label::ElideBehavior elide_behavior) { 113 void LabelButton::SetElideBehavior(Label::ElideBehavior elide_behavior) {
122 label_->SetElideBehavior(elide_behavior); 114 label_->SetElideBehavior(elide_behavior);
123 } 115 }
124 116
125 gfx::HorizontalAlignment LabelButton::GetHorizontalAlignment() const { 117 gfx::HorizontalAlignment LabelButton::GetHorizontalAlignment() const {
126 return label_->horizontal_alignment(); 118 return label_->horizontal_alignment();
127 } 119 }
128 120
129 void LabelButton::SetHorizontalAlignment(gfx::HorizontalAlignment alignment) { 121 void LabelButton::SetHorizontalAlignment(gfx::HorizontalAlignment alignment) {
130 label_->SetHorizontalAlignment(alignment); 122 label_->SetHorizontalAlignment(alignment);
(...skipping 274 matching lines...) Expand 10 before | Expand all | Expand 10 after
405 return ui::NativeTheme::kNormal; 397 return ui::NativeTheme::kNormal;
406 } 398 }
407 399
408 ui::NativeTheme::State LabelButton::GetForegroundThemeState( 400 ui::NativeTheme::State LabelButton::GetForegroundThemeState(
409 ui::NativeTheme::ExtraParams* params) const { 401 ui::NativeTheme::ExtraParams* params) const {
410 GetExtraParams(params); 402 GetExtraParams(params);
411 return ui::NativeTheme::kHovered; 403 return ui::NativeTheme::kHovered;
412 } 404 }
413 405
414 } // namespace views 406 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698