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

Side by Side Diff: chrome/browser/ui/cocoa/tabs/tab_strip_controller.h

Issue 23513039: Replace animated tab audio indicator with static tab audio indicator. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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"
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 base::scoped_nsobject<CrTrackingArea> trackingArea_; 125 base::scoped_nsobject<CrTrackingArea> trackingArea_;
126 TabView* hoveredTab_; // weak. Tab that the mouse is hovering over 126 TabView* hoveredTab_; // weak. Tab that the mouse is hovering over
127 127
128 // Array of subviews which are permanent (and which should never be removed), 128 // Array of subviews which are permanent (and which should never be removed),
129 // such as the new-tab button, but *not* the tabs themselves. 129 // such as the new-tab button, but *not* the tabs themselves.
130 base::scoped_nsobject<NSMutableArray> permanentSubviews_; 130 base::scoped_nsobject<NSMutableArray> permanentSubviews_;
131 131
132 // The default favicon, so we can use one copy for all buttons. 132 // The default favicon, so we can use one copy for all buttons.
133 base::scoped_nsobject<NSImage> defaultFavicon_; 133 base::scoped_nsobject<NSImage> defaultFavicon_;
134 134
135 // The audio indicator image, so we can use one copy for all tabs.
136 base::scoped_nsobject<NSImage> audioIndicatorImage_;
137
135 // The amount by which to indent the tabs on the sides (to make room for the 138 // The amount by which to indent the tabs on the sides (to make room for the
136 // red/yellow/green and incognito/fullscreen buttons). 139 // red/yellow/green and incognito/fullscreen buttons).
137 CGFloat leftIndentForControls_; 140 CGFloat leftIndentForControls_;
138 CGFloat rightIndentForControls_; 141 CGFloat rightIndentForControls_;
139 142
140 // Is the mouse currently inside the strip; 143 // Is the mouse currently inside the strip;
141 BOOL mouseInside_; 144 BOOL mouseInside_;
142 145
143 // Helper for performing tab selection as a result of dragging over a tab. 146 // Helper for performing tab selection as a result of dragging over a tab.
144 scoped_ptr<HoverTabSelector> hoverTabSelector_; 147 scoped_ptr<HoverTabSelector> hoverTabSelector_;
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
239 242
240 // Returns the currently active TabContentsController. 243 // Returns the currently active TabContentsController.
241 - (TabContentsController*)activeTabContentsController; 244 - (TabContentsController*)activeTabContentsController;
242 245
243 @end 246 @end
244 247
245 // Returns the parent view to use when showing a sheet for a given web contents. 248 // Returns the parent view to use when showing a sheet for a given web contents.
246 NSView* GetSheetParentViewForWebContents(content::WebContents* web_contents); 249 NSView* GetSheetParentViewForWebContents(content::WebContents* web_contents);
247 250
248 #endif // CHROME_BROWSER_UI_COCOA_TABS_TAB_STRIP_CONTROLLER_H_ 251 #endif // CHROME_BROWSER_UI_COCOA_TABS_TAB_STRIP_CONTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698