diff options
Diffstat (limited to 'chrome/browser/tabs')
-rw-r--r-- | chrome/browser/tabs/tab_strip_model.cc | 24 | ||||
-rw-r--r-- | chrome/browser/tabs/tab_strip_model.h | 11 | ||||
-rw-r--r-- | chrome/browser/tabs/tab_strip_model_unittest.cc | 2 |
3 files changed, 2 insertions, 35 deletions
diff --git a/chrome/browser/tabs/tab_strip_model.cc b/chrome/browser/tabs/tab_strip_model.cc index dc9b968..2fba4b5 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; } @@ -670,12 +656,6 @@ void TabStripModel::ExecuteContextMenuCommand( delegate_->BookmarkAllTabs(); break; } - case CommandUseVerticalTabs: { - UserMetrics::RecordAction("TabContextMenu_UseVerticalTabs", profile_); - - delegate()->ToggleUseVerticalTabs(); - break; - } default: NOTREACHED(); } diff --git a/chrome/browser/tabs/tab_strip_model.h b/chrome/browser/tabs/tab_strip_model.h index 1f5214f..a4c3641 100644 --- a/chrome/browser/tabs/tab_strip_model.h +++ b/chrome/browser/tabs/tab_strip_model.h @@ -223,12 +223,6 @@ class TabStripModelDelegate { // Creates a bookmark folder containing a bookmark for all open tabs. virtual void BookmarkAllTabs() = 0; - - // Returns true if the vertical tabstrip presentation should be used. - virtual bool UseVerticalTabs() const = 0; - - // Toggles the use of the vertical tabstrip. - virtual void ToggleUseVerticalTabs() = 0; }; //////////////////////////////////////////////////////////////////////////////// @@ -553,7 +547,6 @@ class TabStripModel : public NotificationObserver { CommandRestoreTab, CommandTogglePinned, CommandBookmarkAllTabs, - CommandUseVerticalTabs, CommandLast }; @@ -561,10 +554,6 @@ class TabStripModel : public NotificationObserver { bool IsContextMenuCommandEnabled(int context_index, ContextMenuCommand command_id) const; - // Returns true if the specified command is checked. - bool IsContextMenuCommandChecked(int context_index, - ContextMenuCommand command_id) const; - // Performs the action associated with the specified command for the given // TabStripModel index |context_index|. void ExecuteContextMenuCommand(int context_index, diff --git a/chrome/browser/tabs/tab_strip_model_unittest.cc b/chrome/browser/tabs/tab_strip_model_unittest.cc index 60251f2..ac5881a2 100644 --- a/chrome/browser/tabs/tab_strip_model_unittest.cc +++ b/chrome/browser/tabs/tab_strip_model_unittest.cc @@ -70,8 +70,6 @@ class TabStripDummyDelegate : public TabStripModelDelegate { virtual bool CanCloseContentsAt(int index) { return can_close_ ; } virtual bool CanBookmarkAllTabs() const { return false; } virtual void BookmarkAllTabs() {} - virtual bool UseVerticalTabs() const { return false; } - virtual void ToggleUseVerticalTabs() {} private: // A dummy TabContents we give to callers that expect us to actually build a |