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

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

index 34ea502ebe9320ba4f71fc981a88f131e20bcab9..fb6ea0695b8f834cafcdc3104065e1526b71171c 100644

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

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

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

#include "grit/ui_resources.h"

#include "third_party/skia/include/core/SkPaint.h"

#include "third_party/skia/include/effects/SkLerpXfermode.h"

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

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

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

#include "ui/gfx/canvas.h"

#include "ui/gfx/rect.h"

#include "ui/gfx/skia_util.h"

@@ -118,7 +118,7 @@ void LabelButtonBorder::Paint(const View& view, gfx::Canvas* canvas) {

gfx::Rect rect(native_theme_delegate->GetThemePaintRect());

ui::NativeTheme::ExtraParams extra;

const ui::NativeTheme* theme = view.GetNativeTheme();

- const ui::Animation* animation = native_theme_delegate->GetThemeAnimation();

+ const gfx::Animation* animation = native_theme_delegate->GetThemeAnimation();

ui::NativeTheme::State state = native_theme_delegate->GetThemeState(&extra);

if (animation && animation->is_animating()) {

« no previous file with comments | « ui/views/controls/button/label_button.cc ('k') | ui/views/controls/button/text_button.h » ('j') | no next file with comments »