ui/views/controls/button/text_button.h - Issue 23531053: ui/base/animation -> ui/gfx/animation

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/views/controls/button/text_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:

Index: ui/views/controls/button/text_button.h

diff --git a/ui/views/controls/button/text_button.h b/ui/views/controls/button/text_button.h

index c66f288a24196c9237425c0134ceaf2a1d622db6..5dccaa2ad116f1845b11dfc18216e441bf111964 100644

--- a/ui/views/controls/button/text_button.h

+++ b/ui/views/controls/button/text_button.h

@@ -142,7 +142,7 @@ class VIEWS_EXPORT TextButtonBase : public CustomButton,

void set_alignment(TextAlignment alignment) { alignment_ = alignment; }

- const ui::Animation* GetAnimation() const;

+ const gfx::Animation* GetAnimation() const;

void SetIsDefault(bool is_default);

bool is_default() const { return is_default_; }

@@ -234,7 +234,7 @@ class VIEWS_EXPORT TextButtonBase : public CustomButton,

virtual gfx::Rect GetThemePaintRect() const OVERRIDE;

virtual ui::NativeTheme::State GetThemeState(

ui::NativeTheme::ExtraParams* params) const OVERRIDE;

- virtual const ui::Animation* GetThemeAnimation() const OVERRIDE;

+ virtual const gfx::Animation* GetThemeAnimation() const OVERRIDE;

virtual ui::NativeTheme::State GetBackgroundThemeState(

ui::NativeTheme::ExtraParams* params) const OVERRIDE;

virtual ui::NativeTheme::State GetForegroundThemeState(