summaryrefslogtreecommitdiffstats
path: root/chrome/browser/cocoa/tab_controller.h
diff options
context:
space:
mode:
authorrsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-24 22:33:08 +0000
committerrsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-24 22:33:08 +0000
commitaee746fa720bec218bec090746df7e04f26d9f5b (patch)
tree96e679e635f5be8fbeb008bad5c11ac8e4ecf69d /chrome/browser/cocoa/tab_controller.h
parentd26b4418ab4d417e87b1d3fd5367dea0cf978a7c (diff)
downloadchromium_src-aee746fa720bec218bec090746df7e04f26d9f5b.zip
chromium_src-aee746fa720bec218bec090746df7e04f26d9f5b.tar.gz
chromium_src-aee746fa720bec218bec090746df7e04f26d9f5b.tar.bz2
[Mac] Re-enable pinned tabs; add support for mini-tabs and phantom tabs.
This CL rewires the old support for pinned tabs to support mini-tabs. This also removes the kEnablePinnedTabs browser default now that all platforms support it. Note that pinning is now only accessible through the context menu; drag-to-pin has been removed. BUG=36798, 32845 TEST=Right-click and pin two tabs. Test dragging on and off and around the tab strip. TEST=Cmd+W a pinned tab and it should go phantom (renderer closes down) and the tab is made alpha. Review URL: http://codereview.chromium.org/1119005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42548 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa/tab_controller.h')
-rw-r--r--chrome/browser/cocoa/tab_controller.h10
1 files changed, 6 insertions, 4 deletions
diff --git a/chrome/browser/cocoa/tab_controller.h b/chrome/browser/cocoa/tab_controller.h
index 06d58c8..e5455ac 100644
--- a/chrome/browser/cocoa/tab_controller.h
+++ b/chrome/browser/cocoa/tab_controller.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -44,7 +44,8 @@ class MenuDelegate;
NSRect originalIconFrame_; // frame of iconView_ as loaded from nib
BOOL isIconShowing_; // last state of iconView_ in updateVisibility
BOOL selected_;
- BOOL pinned_;
+ BOOL mini_;
+ BOOL phantom_;
TabLoadingState loadingState_;
CGFloat iconTitleXOffset_; // between left edges of icon and title
CGFloat titleCloseWidthOffset_; // between right edges of icon and close btn.
@@ -58,7 +59,8 @@ class MenuDelegate;
@property(assign, nonatomic) TabLoadingState loadingState;
@property(assign, nonatomic) BOOL selected;
-@property(assign, nonatomic) BOOL pinned;
+@property(assign, nonatomic) BOOL mini;
+@property(assign, nonatomic) BOOL phantom;
@property(assign, nonatomic) id target;
@property(assign, nonatomic) SEL action;
@@ -68,7 +70,7 @@ class MenuDelegate;
+ (CGFloat)minTabWidth;
+ (CGFloat)maxTabWidth;
+ (CGFloat)minSelectedTabWidth;
-+ (CGFloat)pinnedTabWidth;
++ (CGFloat)miniTabWidth;
// The view associated with this controller, pre-casted as a TabView
- (TabView*)tabView;