ui/views/controls/button/label_button.cc - 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/label_button.cc

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/label_button.cc

diff --git a/ui/views/controls/button/label_button.cc b/ui/views/controls/button/label_button.cc

index 7abdc3b3ae857e558816571d42edd866a4f864bf..901dbf4063f64c37de117ba5ec34ca68597219ba 100644

--- a/ui/views/controls/button/label_button.cc

+++ b/ui/views/controls/button/label_button.cc

@@ -6,8 +6,8 @@

#include "base/logging.h"

#include "grit/ui_resources.h"

-#include "ui/base/animation/throb_animation.h"

#include "ui/base/resource/resource_bundle.h"

+#include "ui/gfx/animation/throb_animation.h"

#include "ui/gfx/sys_color_change_listener.h"

#include "ui/native_theme/native_theme.h"

#include "ui/views/controls/button/label_button_border.h"

@@ -346,7 +346,7 @@ ui::NativeTheme::State LabelButton::GetThemeState(

return ui::NativeTheme::kNormal;

}

-const ui::Animation* LabelButton::GetThemeAnimation() const {

+const gfx::Animation* LabelButton::GetThemeAnimation() const {

#if defined(OS_WIN)

if (style() == STYLE_NATIVE_TEXTBUTTON &&

GetNativeTheme() == ui::NativeThemeWin::instance()) {