diff options
| author | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-24 22:33:08 +0000 |
|---|---|---|
| committer | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-24 22:33:08 +0000 |
| commit | aee746fa720bec218bec090746df7e04f26d9f5b (patch) | |
| tree | 96e679e635f5be8fbeb008bad5c11ac8e4ecf69d /chrome/browser/tab_menu_model.cc | |
| parent | d26b4418ab4d417e87b1d3fd5367dea0cf978a7c (diff) | |
| download | chromium_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/tab_menu_model.cc')
| -rw-r--r-- | chrome/browser/tab_menu_model.cc | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/chrome/browser/tab_menu_model.cc b/chrome/browser/tab_menu_model.cc index f0fe251..d2b38ce 100644 --- a/chrome/browser/tab_menu_model.cc +++ b/chrome/browser/tab_menu_model.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. Use of this +// 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. @@ -19,17 +19,15 @@ void TabMenuModel::Build() { AddItemWithStringId(TabStripModel::CommandReload, IDS_TAB_CXMENU_RELOAD); AddItemWithStringId(TabStripModel::CommandDuplicate, IDS_TAB_CXMENU_DUPLICATE); - if (browser_defaults::kEnablePinnedTabs) { // On Mac the HIG prefers "pin/unpin" to a checkmark. The Mac code will fix up // the actual string based on the tab's state via the delegate. #if defined(OS_MACOSX) - AddItemWithStringId(TabStripModel::CommandTogglePinned, - IDS_TAB_CXMENU_PIN_TAB); + AddItemWithStringId(TabStripModel::CommandTogglePinned, + IDS_TAB_CXMENU_PIN_TAB); #else - AddCheckItemWithStringId(TabStripModel::CommandTogglePinned, - IDS_TAB_CXMENU_PIN_TAB); + AddCheckItemWithStringId(TabStripModel::CommandTogglePinned, + IDS_TAB_CXMENU_PIN_TAB); #endif - } AddSeparator(); AddItemWithStringId(TabStripModel::CommandCloseTab, IDS_TAB_CXMENU_CLOSETAB); |