Separate AddToNewGroup and OpenTabGroupEditor invocations

This is a no-op for every non-test instance of AddToNewGroup except for here: https://source.chromium.org/chromium/chromium/src/+/master:chrome/browser/extensions/api/tabs/tabs_api.cc;l=1844

So the editor bubble is still auto-opened in almost every case of creating a new group, except when it happens via an extension.

Bug: 1106846
Change-Id: Ide379350893a5a5bc31e2ee653ceacac6c42560e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2613786Reviewed-by: Charlene Yan <cyan@chromium.org>
Reviewed-by: Elly Fong-Jones <ellyjones@chromium.org>
Commit-Queue: Connie Wan <connily@chromium.org>
Cr-Commit-Position: refs/heads/master@{#841107}

chrome/browser/ui/browser_tabstrip.cc

@@ -124,6 +124,7 @@ void ConfigureTabGroupForNavigation(NavigateParams* nav_params) {
     if (ShouldAutoCreateGroupForNavigation(nav_params)) {
       nav_params->group =
           model->AddToNewGroup({source_index, source_index + 1});
+      model->OpenTabGroupEditor(nav_params->group.value());
     }
   }
 }

chrome/browser/ui/tabs/tab_strip_model.cc

@@ -1058,7 +1058,6 @@ tab_groups::TabGroupId TabStripModel::AddToNewGroup(
   const tab_groups::TabGroupId new_group =
       tab_groups::TabGroupId::GenerateNew();
   AddToNewGroupImpl(indices, new_group);
-  OpenTabGroupEditor(new_group);
   return new_group;
 }
 
@@ -1387,10 +1386,12 @@ void TabStripModel::ExecuteContextMenuCommand(int context_index,
     case CommandToggleGrouped: {
       std::vector<int> indices = GetIndicesForCommand(context_index);
       bool group = WillContextMenuGroup(context_index);
-      if (group)
-        AddToNewGroup(indices);
-      else
+      if (group) {
+        tab_groups::TabGroupId new_group = AddToNewGroup(indices);
+        OpenTabGroupEditor(new_group);
+      } else {
         RemoveFromGroup(indices);
+      }
 
       break;
     }
@@ -1424,7 +1425,9 @@ void TabStripModel::ExecuteContextMenuCommand(int context_index,
     case CommandAddToNewGroup: {
       base::RecordAction(UserMetricsAction("TabContextMenu_AddToNewGroup"));
 
-      AddToNewGroup(GetIndicesForCommand(context_index));
+      tab_groups::TabGroupId new_group =
+          AddToNewGroup(GetIndicesForCommand(context_index));
+      OpenTabGroupEditor(new_group);
       break;
     }
 

chrome/browser/ui/views/tabs/tab_group_editor_bubble_view_browsertest.cc

@@ -25,6 +25,7 @@ class TabGroupEditorBubbleViewDialogBrowserTest : public DialogBrowserTest {
   void ShowUi(const std::string& name) override {
     tab_groups::TabGroupId group =
         browser()->tab_strip_model()->AddToNewGroup({0});
+    browser()->tab_strip_model()->OpenTabGroupEditor(group);
 
     BrowserView* browser_view = static_cast<BrowserView*>(browser()->window());
     TabGroupHeader* header = browser_view->tabstrip()->group_header(group);