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

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

Issue 23531053: ui/base/animation -> ui/gfx/animation (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge 2 trunk Created 7 years, 3 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
« no previous file with comments | « ui/views/controls/button/image_button.cc ('k') | 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 "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "third_party/skia/include/core/SkColor.h" 9 #include "third_party/skia/include/core/SkColor.h"
10 #include "ui/gfx/font.h" 10 #include "ui/gfx/font.h"
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 91
92 // Overridden from View: 92 // Overridden from View:
93 virtual void ChildPreferredSizeChanged(View* child) OVERRIDE; 93 virtual void ChildPreferredSizeChanged(View* child) OVERRIDE;
94 virtual void OnNativeThemeChanged(const ui::NativeTheme* theme) OVERRIDE; 94 virtual void OnNativeThemeChanged(const ui::NativeTheme* theme) OVERRIDE;
95 95
96 // Overridden from NativeThemeDelegate: 96 // Overridden from NativeThemeDelegate:
97 virtual ui::NativeTheme::Part GetThemePart() const OVERRIDE; 97 virtual ui::NativeTheme::Part GetThemePart() const OVERRIDE;
98 virtual gfx::Rect GetThemePaintRect() const OVERRIDE; 98 virtual gfx::Rect GetThemePaintRect() const OVERRIDE;
99 virtual ui::NativeTheme::State GetThemeState( 99 virtual ui::NativeTheme::State GetThemeState(
100 ui::NativeTheme::ExtraParams* params) const OVERRIDE; 100 ui::NativeTheme::ExtraParams* params) const OVERRIDE;
101 virtual const ui::Animation* GetThemeAnimation() const OVERRIDE; 101 virtual const gfx::Animation* GetThemeAnimation() const OVERRIDE;
102 virtual ui::NativeTheme::State GetBackgroundThemeState( 102 virtual ui::NativeTheme::State GetBackgroundThemeState(
103 ui::NativeTheme::ExtraParams* params) const OVERRIDE; 103 ui::NativeTheme::ExtraParams* params) const OVERRIDE;
104 virtual ui::NativeTheme::State GetForegroundThemeState( 104 virtual ui::NativeTheme::State GetForegroundThemeState(
105 ui::NativeTheme::ExtraParams* params) const OVERRIDE; 105 ui::NativeTheme::ExtraParams* params) const OVERRIDE;
106 106
107 // The image and label shown in the button. 107 // The image and label shown in the button.
108 ImageView* image_; 108 ImageView* image_;
109 Label* label_; 109 Label* label_;
110 110
111 // The images and colors for each button state. 111 // The images and colors for each button state.
(...skipping 15 matching lines...) Expand all
127 127
128 // The button's overall style. 128 // The button's overall style.
129 ButtonStyle style_; 129 ButtonStyle style_;
130 130
131 DISALLOW_COPY_AND_ASSIGN(LabelButton); 131 DISALLOW_COPY_AND_ASSIGN(LabelButton);
132 }; 132 };
133 133
134 } // namespace views 134 } // namespace views
135 135
136 #endif // UI_VIEWS_CONTROLS_BUTTON_LABEL_BUTTON_H_ 136 #endif // UI_VIEWS_CONTROLS_BUTTON_LABEL_BUTTON_H_
OLDNEW
« no previous file with comments | « ui/views/controls/button/image_button.cc ('k') | ui/views/controls/button/label_button.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698