diff options
| author | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-21 20:18:37 +0000 |
|---|---|---|
| committer | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-21 20:18:37 +0000 |
| commit | 04a2e4e64e5edf32dabf62d12c9589ba53552254 (patch) | |
| tree | c2426c478cd8d8c381635e78fb09589bbda0ea5d /chrome/browser/ui/tabs/tab_menu_model.cc | |
| parent | 37ac29a12e504069b1f000cd28f7b59ae6eebfa2 (diff) | |
| download | chromium_src-04a2e4e64e5edf32dabf62d12c9589ba53552254.zip chromium_src-04a2e4e64e5edf32dabf62d12c9589ba53552254.tar.gz chromium_src-04a2e4e64e5edf32dabf62d12c9589ba53552254.tar.bz2 | |
[Mac] First pass at multiple selection in the tabstrip.
This hooks up a new TabController state (called 'active') to indicate what
'selected' used to: key/focused state. The selected state can now be applied to
multiple TabControllers.
Currently only commands available through the context menu are usable for a
multi-tab selection. Support for dragging will come in a future CL.
The other notable chane is that tab activation now happens on |-mouseUp:|
rather than |-mouseDown:|, which is in preparation for multi-tab dragging.
BUG=78816
TEST=Shift click, Cmd click, and Cmd+Shift click to select tabs in different ways.
Review URL: http://codereview.chromium.org/6821003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@82543 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/tabs/tab_menu_model.cc')
| -rw-r--r-- | chrome/browser/ui/tabs/tab_menu_model.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/ui/tabs/tab_menu_model.cc b/chrome/browser/ui/tabs/tab_menu_model.cc index 070507e..28b58f5 100644 --- a/chrome/browser/ui/tabs/tab_menu_model.cc +++ b/chrome/browser/ui/tabs/tab_menu_model.cc @@ -60,7 +60,7 @@ void TabMenuModel::Build(bool is_pinned) { } void TabMenuModel::Build(TabStripModel* tab_strip, int index) { - bool effects_multiple_tabs = + bool affects_multiple_tabs = (tab_strip->IsTabSelected(index) && tab_strip->selection_model().selected_indices().size() > 1); AddItemWithStringId(TabStripModel::CommandNewTab, IDS_TAB_CXMENU_NEWTAB); @@ -69,7 +69,7 @@ void TabMenuModel::Build(TabStripModel* tab_strip, int index) { AddItemWithStringId(TabStripModel::CommandDuplicate, IDS_TAB_CXMENU_DUPLICATE); bool will_pin = tab_strip->WillContextMenuPin(index); - if (effects_multiple_tabs) { + if (affects_multiple_tabs) { AddItemWithStringId( TabStripModel::CommandTogglePinned, will_pin ? IDS_TAB_CXMENU_PIN_TABS : IDS_TAB_CXMENU_UNPIN_TABS); @@ -79,7 +79,7 @@ void TabMenuModel::Build(TabStripModel* tab_strip, int index) { will_pin ? IDS_TAB_CXMENU_PIN_TAB : IDS_TAB_CXMENU_UNPIN_TAB); } AddSeparator(); - if (effects_multiple_tabs) { + if (affects_multiple_tabs) { AddItemWithStringId(TabStripModel::CommandCloseTab, IDS_TAB_CXMENU_CLOSETABS); } else { |