summaryrefslogtreecommitdiffstats
path: root/chrome/browser/tabs/tab_strip_model.cc
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-20 20:50:14 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-20 20:50:14 +0000
commitfaa223fba8ebc8b664d63fdaabdf2f2e088a1f16 (patch)
treebedb8067c80e556be606b6dff196f1e58950b223 /chrome/browser/tabs/tab_strip_model.cc
parent9db1531af8305e917ff5bb02657bc9130b073b53 (diff)
downloadchromium_src-faa223fba8ebc8b664d63fdaabdf2f2e088a1f16.zip
chromium_src-faa223fba8ebc8b664d63fdaabdf2f2e088a1f16.tar.gz
chromium_src-faa223fba8ebc8b664d63fdaabdf2f2e088a1f16.tar.bz2
Revert 45065 - Relanding this. Originally landed as http://codereview.chromium.org/1001003 but reverted due to reliability crashes.
Relanding so I can see what those crashes are. Please do not revert without informing me. BUG=none TEST=none Review URL: http://codereview.chromium.org/1655010 TBR=ben@chromium.org Review URL: http://codereview.chromium.org/1715001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45077 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/tabs/tab_strip_model.cc')
-rw-r--r--chrome/browser/tabs/tab_strip_model.cc26
1 files changed, 2 insertions, 24 deletions
diff --git a/chrome/browser/tabs/tab_strip_model.cc b/chrome/browser/tabs/tab_strip_model.cc
index b8c52b2..b5095a2 100644
--- a/chrome/browser/tabs/tab_strip_model.cc
+++ b/chrome/browser/tabs/tab_strip_model.cc
@@ -574,25 +574,11 @@ bool TabStripModel::IsContextMenuCommandEnabled(
return delegate_->CanRestoreTab();
case CommandTogglePinned:
return true;
- case CommandBookmarkAllTabs:
+ case CommandBookmarkAllTabs: {
return delegate_->CanBookmarkAllTabs();
- case CommandUseVerticalTabs:
- return true;
- default:
- NOTREACHED();
- }
- return false;
-}
-
-bool TabStripModel::IsContextMenuCommandChecked(
- int context_index,
- ContextMenuCommand command_id) const {
- switch (command_id) {
- case CommandUseVerticalTabs:
- return delegate()->UseVerticalTabs();
+ }
default:
NOTREACHED();
- break;
}
return false;
}
@@ -669,14 +655,6 @@ void TabStripModel::ExecuteContextMenuCommand(
delegate_->BookmarkAllTabs();
break;
}
- case CommandUseVerticalTabs: {
- UserMetrics::RecordAction(
- UserMetricsAction("TabContextMenu_UseVerticalTabs"),
- profile_);
-
- delegate()->ToggleUseVerticalTabs();
- break;
- }
default:
NOTREACHED();
}