chrome/browser/ui/views/tabs/tab_strip.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: chrome/browser/ui/views/tabs/tab_strip.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: chrome/browser/ui/views/tabs/tab_strip.h

diff --git a/chrome/browser/ui/views/tabs/tab_strip.h b/chrome/browser/ui/views/tabs/tab_strip.h

index 9ace500829588fb914a2e0d59308b578a117c666..cd61ceb422f27fefd9448502977abd241c850cdd 100644

--- a/chrome/browser/ui/views/tabs/tab_strip.h

+++ b/chrome/browser/ui/views/tabs/tab_strip.h

@@ -13,7 +13,7 @@

#include "chrome/browser/ui/tabs/tab_strip_layout_type.h"

#include "chrome/browser/ui/views/tabs/tab.h"

#include "chrome/browser/ui/views/tabs/tab_controller.h"

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

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

#include "ui/gfx/point.h"

#include "ui/gfx/rect.h"

#include "ui/views/animation/bounds_animator.h"

@@ -576,7 +576,7 @@ class TabStrip : public views::View,

// To ensure all tabs pulse at the same time they share the same animation

// container. This is that animation container.

- scoped_refptr<ui::AnimationContainer> animation_container_;

+ scoped_refptr<gfx::AnimationContainer> animation_container_;

// MouseWatcher is used for two things:

// . When a tab is closed to reset the layout.