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

Side by Side 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:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
11 #include "base/memory/ref_counted.h" 11 #include "base/memory/ref_counted.h"
12 #include "base/timer/timer.h" 12 #include "base/timer/timer.h"
13 #include "chrome/browser/ui/tabs/tab_strip_layout_type.h" 13 #include "chrome/browser/ui/tabs/tab_strip_layout_type.h"
14 #include "chrome/browser/ui/views/tabs/tab.h" 14 #include "chrome/browser/ui/views/tabs/tab.h"
15 #include "chrome/browser/ui/views/tabs/tab_controller.h" 15 #include "chrome/browser/ui/views/tabs/tab_controller.h"
16 #include "ui/base/animation/animation_container.h" 16 #include "ui/gfx/animation/animation_container.h"
17 #include "ui/gfx/point.h" 17 #include "ui/gfx/point.h"
18 #include "ui/gfx/rect.h" 18 #include "ui/gfx/rect.h"
19 #include "ui/views/animation/bounds_animator.h" 19 #include "ui/views/animation/bounds_animator.h"
20 #include "ui/views/controls/button/image_button.h" 20 #include "ui/views/controls/button/image_button.h"
21 #include "ui/views/mouse_watcher.h" 21 #include "ui/views/mouse_watcher.h"
22 #include "ui/views/view.h" 22 #include "ui/views/view.h"
23 #include "ui/views/view_model.h" 23 #include "ui/views/view_model.h"
24 24
25 class NewTabButton; 25 class NewTabButton;
26 class StackedTabStripLayout; 26 class StackedTabStripLayout;
(...skipping 542 matching lines...) Expand 10 before | Expand all | Expand 10 after
569 569
570 // True if PrepareForCloseAt has been invoked. When true remove animations 570 // True if PrepareForCloseAt has been invoked. When true remove animations
571 // preserve current tab bounds. 571 // preserve current tab bounds.
572 bool in_tab_close_; 572 bool in_tab_close_;
573 573
574 // Valid for the lifetime of a drag over us. 574 // Valid for the lifetime of a drag over us.
575 scoped_ptr<DropInfo> drop_info_; 575 scoped_ptr<DropInfo> drop_info_;
576 576
577 // To ensure all tabs pulse at the same time they share the same animation 577 // To ensure all tabs pulse at the same time they share the same animation
578 // container. This is that animation container. 578 // container. This is that animation container.
579 scoped_refptr<ui::AnimationContainer> animation_container_; 579 scoped_refptr<gfx::AnimationContainer> animation_container_;
580 580
581 // MouseWatcher is used for two things: 581 // MouseWatcher is used for two things:
582 // . When a tab is closed to reset the layout. 582 // . When a tab is closed to reset the layout.
583 // . When a mouse is used and the layout dynamically adjusts and is currently 583 // . When a mouse is used and the layout dynamically adjusts and is currently
584 // TAB_STRIP_LAYOUT_STACKED. 584 // TAB_STRIP_LAYOUT_STACKED.
585 scoped_ptr<views::MouseWatcher> mouse_watcher_; 585 scoped_ptr<views::MouseWatcher> mouse_watcher_;
586 586
587 // The controller for a drag initiated from a Tab. Valid for the lifetime of 587 // The controller for a drag initiated from a Tab. Valid for the lifetime of
588 // the drag session. 588 // the drag session.
589 scoped_ptr<TabDragController> drag_controller_; 589 scoped_ptr<TabDragController> drag_controller_;
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
622 bool immersive_style_; 622 bool immersive_style_;
623 623
624 // Our observers. 624 // Our observers.
625 typedef ObserverList<TabStripObserver> TabStripObservers; 625 typedef ObserverList<TabStripObserver> TabStripObservers;
626 TabStripObservers observers_; 626 TabStripObservers observers_;
627 627
628 DISALLOW_COPY_AND_ASSIGN(TabStrip); 628 DISALLOW_COPY_AND_ASSIGN(TabStrip);
629 }; 629 };
630 630
631 #endif // CHROME_BROWSER_UI_VIEWS_TABS_TAB_STRIP_H_ 631 #endif // CHROME_BROWSER_UI_VIEWS_TABS_TAB_STRIP_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/tabs/tab_drag_controller.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