Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1089)

Unified Diff: chrome/browser/ui/views/tabs/tab_strip.h

Issue 6154001: Move animation code to new ui/base/animation directory.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 11 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/views/tabs/tab.cc ('k') | chrome/browser/ui/views/tabs/tab_strip.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/tabs/tab_strip.h
===================================================================
--- chrome/browser/ui/views/tabs/tab_strip.h (revision 70685)
+++ chrome/browser/ui/views/tabs/tab_strip.h (working copy)
@@ -6,12 +6,12 @@
#define CHROME_BROWSER_UI_VIEWS_TABS_TAB_STRIP_H_
#pragma once
-#include "app/animation_container.h"
#include "base/ref_counted.h"
#include "base/timer.h"
#include "chrome/browser/views/tabs/base_tab_strip.h"
#include "gfx/point.h"
#include "gfx/rect.h"
+#include "ui/base/animation/animation_container.h"
#include "views/controls/button/image_button.h"
#include "views/mouse_watcher.h"
@@ -271,7 +271,7 @@
// To ensure all tabs pulse at the same time they share the same animation
// container. This is that animation container.
- scoped_refptr<AnimationContainer> animation_container_;
+ scoped_refptr<ui::AnimationContainer> animation_container_;
// Used for stage 1 of new tab animation.
base::OneShotTimer<TabStrip> new_tab_timer_;
« no previous file with comments | « chrome/browser/ui/views/tabs/tab.cc ('k') | chrome/browser/ui/views/tabs/tab_strip.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698