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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
« 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 »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_UI_VIEWS_TABS_TAB_STRIP_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_TABS_TAB_STRIP_H_
6 #define CHROME_BROWSER_UI_VIEWS_TABS_TAB_STRIP_H_ 6 #define CHROME_BROWSER_UI_VIEWS_TABS_TAB_STRIP_H_
7 #pragma once 7 #pragma once
8 8
9 #include "app/animation_container.h"
10 #include "base/ref_counted.h" 9 #include "base/ref_counted.h"
11 #include "base/timer.h" 10 #include "base/timer.h"
12 #include "chrome/browser/views/tabs/base_tab_strip.h" 11 #include "chrome/browser/views/tabs/base_tab_strip.h"
13 #include "gfx/point.h" 12 #include "gfx/point.h"
14 #include "gfx/rect.h" 13 #include "gfx/rect.h"
14 #include "ui/base/animation/animation_container.h"
15 #include "views/controls/button/image_button.h" 15 #include "views/controls/button/image_button.h"
16 #include "views/mouse_watcher.h" 16 #include "views/mouse_watcher.h"
17 17
18 class Tab; 18 class Tab;
19 19
20 namespace views { 20 namespace views {
21 class ImageView; 21 class ImageView;
22 #if defined(OS_LINUX) 22 #if defined(OS_LINUX)
23 class WidgetGtk; 23 class WidgetGtk;
24 #elif defined(OS_WIN) 24 #elif defined(OS_WIN)
(...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after
264 // ThemeProvider. It also makes sense to do this, because the size of the 264 // ThemeProvider. It also makes sense to do this, because the size of the
265 // new tab button should not need to be calculated dynamically. 265 // new tab button should not need to be calculated dynamically.
266 static const int kNewTabButtonWidth = 28; 266 static const int kNewTabButtonWidth = 28;
267 static const int kNewTabButtonHeight = 18; 267 static const int kNewTabButtonHeight = 18;
268 268
269 // Valid for the lifetime of a drag over us. 269 // Valid for the lifetime of a drag over us.
270 scoped_ptr<DropInfo> drop_info_; 270 scoped_ptr<DropInfo> drop_info_;
271 271
272 // To ensure all tabs pulse at the same time they share the same animation 272 // To ensure all tabs pulse at the same time they share the same animation
273 // container. This is that animation container. 273 // container. This is that animation container.
274 scoped_refptr<AnimationContainer> animation_container_; 274 scoped_refptr<ui::AnimationContainer> animation_container_;
275 275
276 // Used for stage 1 of new tab animation. 276 // Used for stage 1 of new tab animation.
277 base::OneShotTimer<TabStrip> new_tab_timer_; 277 base::OneShotTimer<TabStrip> new_tab_timer_;
278 278
279 scoped_ptr<views::MouseWatcher> mouse_watcher_; 279 scoped_ptr<views::MouseWatcher> mouse_watcher_;
280 280
281 DISALLOW_COPY_AND_ASSIGN(TabStrip); 281 DISALLOW_COPY_AND_ASSIGN(TabStrip);
282 }; 282 };
283 283
284 #endif // CHROME_BROWSER_UI_VIEWS_TABS_TAB_STRIP_H_ 284 #endif // CHROME_BROWSER_UI_VIEWS_TABS_TAB_STRIP_H_
OLDNEW
« 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