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

Side by Side Diff: chrome/browser/ui/cocoa/tabs/tab_strip_controller.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_COCOA_TABS_TAB_STRIP_CONTROLLER_H_ 5 #ifndef CHROME_BROWSER_UI_COCOA_TABS_TAB_STRIP_CONTROLLER_H_
6 #define CHROME_BROWSER_UI_COCOA_TABS_TAB_STRIP_CONTROLLER_H_ 6 #define CHROME_BROWSER_UI_COCOA_TABS_TAB_STRIP_CONTROLLER_H_
7 7
8 #import <Cocoa/Cocoa.h> 8 #import <Cocoa/Cocoa.h>
9 9
10 #include "base/mac/scoped_nsobject.h" 10 #include "base/mac/scoped_nsobject.h"
11 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
12 #import "chrome/browser/ui/cocoa/tabs/tab_controller_target.h" 12 #import "chrome/browser/ui/cocoa/tabs/tab_controller_target.h"
13 #import "chrome/browser/ui/cocoa/url_drop_target.h" 13 #import "chrome/browser/ui/cocoa/url_drop_target.h"
14 #include "chrome/browser/ui/tabs/hover_tab_selector.h" 14 #include "chrome/browser/ui/tabs/hover_tab_selector.h"
15 15
16 @class CrTrackingArea; 16 @class CrTrackingArea;
17 @class NewTabButton; 17 @class NewTabButton;
18 @class TabContentsController; 18 @class TabContentsController;
19 @class TabView; 19 @class TabView;
20 @class TabStripDragController; 20 @class TabStripDragController;
21 @class TabStripView; 21 @class TabStripView;
22 22
23 class Browser; 23 class Browser;
24 class TabStripModelObserverBridge; 24 class TabStripModelObserverBridge;
25 class TabStripModel; 25 class TabStripModel;
26 26
27 namespace content { 27 namespace content {
28 class WebContents; 28 class WebContents;
29 } 29 }
30 namespace ui { 30 namespace gfx {
31 class AnimationContainer; 31 class AnimationContainer;
32 } 32 }
33 33
34 // The interface for the tab strip controller's delegate. 34 // The interface for the tab strip controller's delegate.
35 // Delegating TabStripModelObserverBridge's events (in lieu of directly 35 // Delegating TabStripModelObserverBridge's events (in lieu of directly
36 // subscribing to TabStripModelObserverBridge events, as TabStripController 36 // subscribing to TabStripModelObserverBridge events, as TabStripController
37 // does) is necessary to guarantee a proper order of subviews layout updates, 37 // does) is necessary to guarantee a proper order of subviews layout updates,
38 // otherwise it might trigger unnesessary content relayout, UI flickering etc. 38 // otherwise it might trigger unnesessary content relayout, UI flickering etc.
39 @protocol TabStripControllerDelegate 39 @protocol TabStripControllerDelegate
40 40
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 // red/yellow/green and incognito/fullscreen buttons). 136 // red/yellow/green and incognito/fullscreen buttons).
137 CGFloat leftIndentForControls_; 137 CGFloat leftIndentForControls_;
138 CGFloat rightIndentForControls_; 138 CGFloat rightIndentForControls_;
139 139
140 // Is the mouse currently inside the strip; 140 // Is the mouse currently inside the strip;
141 BOOL mouseInside_; 141 BOOL mouseInside_;
142 142
143 // Helper for performing tab selection as a result of dragging over a tab. 143 // Helper for performing tab selection as a result of dragging over a tab.
144 scoped_ptr<HoverTabSelector> hoverTabSelector_; 144 scoped_ptr<HoverTabSelector> hoverTabSelector_;
145 145
146 scoped_refptr<ui::AnimationContainer> animationContainer_; 146 scoped_refptr<gfx::AnimationContainer> animationContainer_;
147 } 147 }
148 148
149 @property(nonatomic) CGFloat leftIndentForControls; 149 @property(nonatomic) CGFloat leftIndentForControls;
150 @property(nonatomic) CGFloat rightIndentForControls; 150 @property(nonatomic) CGFloat rightIndentForControls;
151 151
152 // Initialize the controller with a view and browser that contains 152 // Initialize the controller with a view and browser that contains
153 // everything else we'll need. |switchView| is the view whose contents get 153 // everything else we'll need. |switchView| is the view whose contents get
154 // "switched" every time the user switches tabs. The children of this view 154 // "switched" every time the user switches tabs. The children of this view
155 // will be released, so if you want them to stay around, make sure 155 // will be released, so if you want them to stay around, make sure
156 // you have retained them. 156 // you have retained them.
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
239 239
240 // Returns the currently active TabContentsController. 240 // Returns the currently active TabContentsController.
241 - (TabContentsController*)activeTabContentsController; 241 - (TabContentsController*)activeTabContentsController;
242 242
243 @end 243 @end
244 244
245 // Returns the parent view to use when showing a sheet for a given web contents. 245 // Returns the parent view to use when showing a sheet for a given web contents.
246 NSView* GetSheetParentViewForWebContents(content::WebContents* web_contents); 246 NSView* GetSheetParentViewForWebContents(content::WebContents* web_contents);
247 247
248 #endif // CHROME_BROWSER_UI_COCOA_TABS_TAB_STRIP_CONTROLLER_H_ 248 #endif // CHROME_BROWSER_UI_COCOA_TABS_TAB_STRIP_CONTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698