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

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

Issue 6802026: Move profile menu button to leave room for full screen button (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 8 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 | « no previous file | chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm » ('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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #pragma once 7 #pragma once
8 8
9 #import <Cocoa/Cocoa.h> 9 #import <Cocoa/Cocoa.h>
10 10
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 @protected 69 @protected
70 // YES if tabs are to be laid out vertically instead of horizontally. 70 // YES if tabs are to be laid out vertically instead of horizontally.
71 BOOL verticalLayout_; 71 BOOL verticalLayout_;
72 72
73 @private 73 @private
74 scoped_nsobject<TabStripView> tabStripView_; 74 scoped_nsobject<TabStripView> tabStripView_;
75 NSView* switchView_; // weak 75 NSView* switchView_; // weak
76 scoped_nsobject<NSView> dragBlockingView_; // avoid bad window server drags 76 scoped_nsobject<NSView> dragBlockingView_; // avoid bad window server drags
77 NewTabButton* newTabButton_; // weak, obtained from the nib. 77 NewTabButton* newTabButton_; // weak, obtained from the nib.
78 ProfileMenuButton* profileMenuButton_; // weak, obtained from the nib. 78 ProfileMenuButton* profileMenuButton_; // weak, obtained from the nib.
79 BOOL hasUpdatedProfileMenuButtonXOffset_;
79 80
80 // Tracks the newTabButton_ for rollovers. 81 // Tracks the newTabButton_ for rollovers.
81 scoped_nsobject<CrTrackingArea> newTabTrackingArea_; 82 scoped_nsobject<CrTrackingArea> newTabTrackingArea_;
82 scoped_ptr<TabStripModelObserverBridge> bridge_; 83 scoped_ptr<TabStripModelObserverBridge> bridge_;
83 Browser* browser_; // weak 84 Browser* browser_; // weak
84 TabStripModel* tabStripModel_; // weak 85 TabStripModel* tabStripModel_; // weak
85 // Delegate that is informed about tab state changes. 86 // Delegate that is informed about tab state changes.
86 id<TabStripControllerDelegate> delegate_; // weak 87 id<TabStripControllerDelegate> delegate_; // weak
87 88
88 // YES if the new tab button is currently displaying the hover image (if the 89 // YES if the new tab button is currently displaying the hover image (if the
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
264 - (void)attachConstrainedWindow:(ConstrainedWindowMac*)window; 265 - (void)attachConstrainedWindow:(ConstrainedWindowMac*)window;
265 - (void)removeConstrainedWindow:(ConstrainedWindowMac*)window; 266 - (void)removeConstrainedWindow:(ConstrainedWindowMac*)window;
266 267
267 @end 268 @end
268 269
269 // Notification sent when the number of tabs changes. The object will be this 270 // Notification sent when the number of tabs changes. The object will be this
270 // controller. 271 // controller.
271 extern NSString* const kTabStripNumberOfTabsChanged; 272 extern NSString* const kTabStripNumberOfTabsChanged;
272 273
273 #endif // CHROME_BROWSER_UI_COCOA_TABS_TAB_STRIP_CONTROLLER_H_ 274 #endif // CHROME_BROWSER_UI_COCOA_TABS_TAB_STRIP_CONTROLLER_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698