chrome/browser/extensions/extension_action.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: chrome/browser/extensions/extension_action.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: chrome/browser/extensions/extension_action.cc

diff --git a/chrome/browser/extensions/extension_action.cc b/chrome/browser/extensions/extension_action.cc

index a5712c8820048f0cc6c3e1d9de3525d016f11617..ccce0ca5256ee1b09595234e2a901170a48dd94c 100644

--- a/chrome/browser/extensions/extension_action.cc

+++ b/chrome/browser/extensions/extension_action.cc

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

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

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

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

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

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

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

#include "ui/gfx/canvas.h"

#include "ui/gfx/color_utils.h"

#include "ui/gfx/image/image.h"

@@ -93,7 +93,7 @@ const int kIconFadeInDurationMs = 100;

const int kIconFadeInFramesPerSecond = 50;

ExtensionAction::IconAnimation::IconAnimation()

- : ui::LinearAnimation(kIconFadeInDurationMs, kIconFadeInFramesPerSecond,

+ : gfx::LinearAnimation(kIconFadeInDurationMs, kIconFadeInFramesPerSecond,

NULL),

weak_ptr_factory_(this) {}

« no previous file with comments | « chrome/browser/extensions/extension_action.h ('k') | chrome/browser/infobars/infobar.h » ('j') | no next file with comments »