Remove "Close tabs opened by this tab".

BUG=none
TEST=Right click a tab, "Close opened by" should not be in the context menu.
Review URL: http://codereview.chromium.org/2903004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52143 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 0 insertions, 64 deletions

diff --git a/chrome/browser/tabs/tab_strip_model.cc b/chrome/browser/tabs/tab_strip_model.cc
index 93d3918..d48ba03 100644
--- a/chrome/browser/tabs/tab_strip_model.cc
+++ b/chrome/browser/tabs/tab_strip_model.cc
@@ -623,11 +623,6 @@ bool TabStripModel::IsContextMenuCommandEnabled(
       // Close doesn't effect mini-tabs.
       return count() != IndexOfFirstNonMiniTab() &&
           context_index < (count() - 1);
-    case CommandCloseTabsOpenedBy: {
-      int next_index = GetIndexOfNextTabContentsOpenedBy(
-          &GetTabContentsAt(context_index)->controller(), context_index, true);
-      return next_index != kNoTab && !IsMiniTab(next_index);
-    }
     case CommandDuplicate:
       return delegate_->CanDuplicateContentsAt(context_index);
     case CommandRestoreTab:
@@ -700,14 +695,6 @@ void TabStripModel::ExecuteContextMenuCommand(
                         CLOSE_CREATE_HISTORICAL_TAB);
       break;
     }
-    case CommandCloseTabsOpenedBy: {
-      UserMetrics::RecordAction(
-          UserMetricsAction("TabContextMenu_CloseTabsOpenedBy"),
-          profile_);
-      InternalCloseTabs(GetIndicesClosedByCommand(context_index, command_id),
-                        CLOSE_CREATE_HISTORICAL_TAB);
-      break;
-    }
     case CommandRestoreTab: {
       UserMetrics::RecordAction(UserMetricsAction("TabContextMenu_RestoreTab"),
                                 profile_);
@@ -787,15 +774,6 @@ std::vector<int> TabStripModel::GetIndicesClosedByCommand(
   // NOTE: some callers assume indices are sorted in reverse order.
   std::vector<int> indices;
 
-  if (id == CommandCloseTabsOpenedBy) {
-    NavigationController* opener = &GetTabContentsAt(index)->controller();
-    for (int i = count() - 1; i >= 0; --i) {
-      if (OpenerMatches(contents_data_[i], opener, true) && !IsMiniTab(i))
-        indices.push_back(i);
-    }
-    return indices;
-  }
-
   if (id != CommandCloseTabsToRight && id != CommandCloseOtherTabs)
     return indices;
 
diff --git a/chrome/browser/tabs/tab_strip_model.h b/chrome/browser/tabs/tab_strip_model.h
index ea76ea6..a9a420a 100644
--- a/chrome/browser/tabs/tab_strip_model.h
+++ b/chrome/browser/tabs/tab_strip_model.h
@@ -613,7 +613,6 @@ class TabStripModel : public NotificationObserver {
     CommandCloseTab,
     CommandCloseOtherTabs,
     CommandCloseTabsToRight,
-    CommandCloseTabsOpenedBy,
     CommandRestoreTab,
     CommandTogglePinned,
     CommandToggleToolbar,
diff --git a/chrome/browser/tabs/tab_strip_model_unittest.cc b/chrome/browser/tabs/tab_strip_model_unittest.cc
index d21d7b5..422a173 100644
--- a/chrome/browser/tabs/tab_strip_model_unittest.cc
+++ b/chrome/browser/tabs/tab_strip_model_unittest.cc
@@ -833,7 +833,6 @@ TEST_F(TabStripModelTest, TestSelectOnClose) {
 //  - Close Tab
 //  - Close Other Tabs
 //  - Close Tabs To Right
-//  - Close Tabs Opened By
 TEST_F(TabStripModelTest, TestContextMenuCloseCommands) {
   TabStripDummyDelegate delegate(NULL);
   TabStripModel tabstrip(&delegate, profile());
@@ -865,17 +864,6 @@ TEST_F(TabStripModelTest, TestContextMenuCloseCommands) {
   InsertTabContentses(&tabstrip, contents1, contents2, contents3);
   EXPECT_EQ(5, tabstrip.count());
 
-  tabstrip.ExecuteContextMenuCommand(0,
-                                     TabStripModel::CommandCloseTabsOpenedBy);
-  EXPECT_EQ(2, tabstrip.count());
-  EXPECT_EQ(dummy_contents, tabstrip.GetTabContentsAt(1));
-
-  contents1 = CreateTabContents();
-  contents2 = CreateTabContents();
-  contents3 = CreateTabContents();
-  InsertTabContentses(&tabstrip, contents1, contents2, contents3);
-  EXPECT_EQ(5, tabstrip.count());
-
   int dummy_index = tabstrip.count() - 1;
   tabstrip.SelectTabContentsAt(dummy_index, true);
   EXPECT_EQ(dummy_contents, tabstrip.GetSelectedTabContents());
@@ -936,35 +924,6 @@ TEST_F(TabStripModelTest, GetIndicesClosedByCommand) {
   EXPECT_TRUE(tabstrip.empty());
 }
 
-// Tests GetIndicesClosedByCommand.
-TEST_F(TabStripModelTest, GetIndicesClosedByCommandWithOpener) {
-  TabStripDummyDelegate delegate(NULL);
-  TabStripModel tabstrip(&delegate, profile());
-  EXPECT_TRUE(tabstrip.empty());
-
-  TabContents* contents1 = CreateTabContents();
-  TabContents* contents2 = CreateTabContents();
-  TabContents* contents3 = CreateTabContents();
-  TabContents* contents4 = CreateTabContents();
-
-  tabstrip.AppendTabContents(contents1, true);
-  InsertTabContentses(&tabstrip, contents2, contents3, contents4);
-
-  EXPECT_EQ("3 2 1", GetIndicesClosedByCommandAsString(
-                tabstrip, 0, TabStripModel::CommandCloseTabsOpenedBy));
-
-  // Pin the first two tabs and make sure the index isn't returned when asking
-  // for the openner.
-  tabstrip.SetTabPinned(0, true);
-  tabstrip.SetTabPinned(1, true);
-
-  EXPECT_EQ("3 2", GetIndicesClosedByCommandAsString(
-                tabstrip, 0, TabStripModel::CommandCloseTabsOpenedBy));
-
-  tabstrip.CloseAllTabs();
-  EXPECT_TRUE(tabstrip.empty());
-}
-
 // Tests whether or not TabContentses are inserted in the correct position
 // using this "smart" function with a simulated middle click action on a series
 // of links on the home page.