Use TabStripModelObserver's new API: trivial files 1/2

Replace old API with new API. This CL is a refactor
and has no intended behavior change.

Bug: 842194
Change-Id: I0d635e46bbaf3f9cfb7d5083445319c341c0cb76
Reviewed-on: https://chromium-review.googlesource.com/c/1245861Reviewed-by: Scott Violet <sky@chromium.org>
Reviewed-by: Erik Chen <erikchen@chromium.org>
Commit-Queue: Sang Woo Ko <sangwoo108@chromium.org>
Cr-Commit-Position: refs/heads/master@{#599700}

chrome/browser/ui/browser_browsertest.cc

@@ -184,14 +184,21 @@ int CountRenderProcessHosts() {
   return result;
 }
 
-class MockTabStripModelObserver : public TabStripModelObserver {
+class TabClosingObserver : public TabStripModelObserver {
  public:
-  MockTabStripModelObserver() : closing_count_(0) {}
+  TabClosingObserver() : closing_count_(0) {}
 
-  void TabClosingAt(TabStripModel* tab_strip_model,
-                    WebContents* contents,
-                    int index) override {
-    ++closing_count_;
+  void OnTabStripModelChanged(
+      TabStripModel* tab_strip_model,
+      const TabStripModelChange& change,
+      const TabStripSelectionChange& selection) override {
+    if (change.type() != TabStripModelChange::kRemoved)
+      return;
+
+    for (const auto& delta : change.deltas()) {
+      if (delta.remove.will_be_deleted)
+        ++closing_count_;
+    }
   }
 
   int closing_count() const { return closing_count_; }
@@ -199,7 +206,7 @@ class MockTabStripModelObserver : public TabStripModelObserver {
  private:
   int closing_count_;
 
-  DISALLOW_COPY_AND_ASSIGN(MockTabStripModelObserver);
+  DISALLOW_COPY_AND_ASSIGN(TabClosingObserver);
 };
 
 // Used by CloseWithAppMenuOpen. Invokes CloseWindow on the supplied browser.
@@ -1157,7 +1164,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, MAYBE_TabClosingWhenRemovingExtension) {
   model->SetTabPinned(0, true);
   ui_test_utils::NavigateToURL(browser(), url);
 
-  MockTabStripModelObserver observer;
+  TabClosingObserver observer;
   model->AddObserver(&observer);
 
   // Uninstall the extension and make sure TabClosing is sent.

chrome/browser/ui/tabs/window_activity_watcher.cc

@@ -140,15 +140,14 @@ class WindowActivityWatcher::BrowserWatcher : public TabStripModelObserver {
 
  private:
   // TabStripModelObserver:
-  void TabInsertedAt(TabStripModel* tab_strip_model,
-                     content::WebContents* contents,
-                     int index,
-                     bool foreground) override {
-    MaybeLogWindowMetricsUkmEntry();
-  }
-  void TabDetachedAt(content::WebContents* contents,
-                     int index,
-                     bool was_active) override {
+  void OnTabStripModelChanged(
+      TabStripModel* tab_strip_model,
+      const TabStripModelChange& change,
+      const TabStripSelectionChange& selection) override {
+    if (change.type() != TabStripModelChange::kInserted &&
+        change.type() != TabStripModelChange::kRemoved)
+      return;
+
     MaybeLogWindowMetricsUkmEntry();
   }
 

chrome/browser/ui/toolbar/app_menu_model.cc

@@ -669,20 +669,18 @@ bool AppMenuModel::GetAcceleratorForCommandId(
   return provider_->GetAcceleratorForCommandId(command_id, accelerator);
 }
 
-void AppMenuModel::ActiveTabChanged(WebContents* old_contents,
-                                    WebContents* new_contents,
-                                    int index,
-                                    int reason) {
-  // The user has switched between tabs and the new tab may have a different
-  // zoom setting.
-  UpdateZoomControls();
-}
+void AppMenuModel::OnTabStripModelChanged(
+    TabStripModel* tab_strip_model,
+    const TabStripModelChange& change,
+    const TabStripSelectionChange& selection) {
+  if (tab_strip_model->empty())
+    return;
 
-void AppMenuModel::TabReplacedAt(TabStripModel* tab_strip_model,
-                                 WebContents* old_contents,
-                                 WebContents* new_contents,
-                                 int index) {
-  UpdateZoomControls();
+  if (selection.active_tab_changed()) {
+    // The user has switched between tabs and the new tab may have a different
+    // zoom setting. Or web contents for a tab has been replaced.
+    UpdateZoomControls();
+  }
 }
 
 void AppMenuModel::Observe(int type,

chrome/browser/ui/toolbar/app_menu_model.h

@@ -136,14 +136,10 @@ class AppMenuModel : public ui::SimpleMenuModel,
                                   ui::Accelerator* accelerator) const override;
 
   // Overridden from TabStripModelObserver:
-  void ActiveTabChanged(content::WebContents* old_contents,
-                        content::WebContents* new_contents,
-                        int index,
-                        int reason) override;
-  void TabReplacedAt(TabStripModel* tab_strip_model,
-                     content::WebContents* old_contents,
-                     content::WebContents* new_contents,
-                     int index) override;
+  void OnTabStripModelChanged(
+      TabStripModel* tab_strip_model,
+      const TabStripModelChange& change,
+      const TabStripSelectionChange& selection) override;
 
   // Overridden from content::NotificationObserver:
   void Observe(int type,

chrome/browser/ui/toolbar/media_router_action.cc

@@ -221,10 +221,13 @@ void MediaRouterAction::OnRoutesUpdated(
   MaybeUpdateIcon();
 }
 
-void MediaRouterAction::ActiveTabChanged(content::WebContents* old_contents,
-                                         content::WebContents* new_contents,
-                                         int index,
-                                         int reason) {
+void MediaRouterAction::OnTabStripModelChanged(
+    TabStripModel* tab_strip_model,
+    const TabStripModelChange& change,
+    const TabStripSelectionChange& selection) {
+  if (!selection.active_tab_changed() || tab_strip_model->empty())
+    return;
+
   RegisterWithDialogController();
   UpdateDialogState();
 }

chrome/browser/ui/toolbar/media_router_action.h

@@ -74,10 +74,10 @@ class MediaRouterAction : public ToolbarActionViewController,
                            joinable_route_ids) override;
 
   // ToolbarStripModelObserver:
-  void ActiveTabChanged(content::WebContents* old_contents,
-                        content::WebContents* new_contents,
-                        int index,
-                        int reason) override;
+  void OnTabStripModelChanged(
+      TabStripModel* tab_strip_model,
+      const TabStripModelChange& change,
+      const TabStripSelectionChange& selection) override;
 
   // ToolbarActionsBarObserver:
   void OnToolbarActionsBarAnimationEnded() override;

chrome/browser/ui/toolbar/media_router_action_unittest.cc

@@ -54,14 +54,14 @@ class TestMediaRouterAction : public MediaRouterAction {
   ~TestMediaRouterAction() override {}
 
   // MediaRouterAction:
-  void ActiveTabChanged(content::WebContents* old_contents,
-                        content::WebContents* new_contents,
-                        int index,
-                        int reason) override {
+  void OnTabStripModelChanged(
+      TabStripModel* tab_strip_model,
+      const TabStripModelChange& change,
+      const TabStripSelectionChange& selection) override {
     // This would be null if |controller_| hasn't been set.
     if (GetMediaRouterDialogController()) {
-      MediaRouterAction::ActiveTabChanged(old_contents, new_contents, index,
-                                          reason);
+      MediaRouterAction::OnTabStripModelChanged(tab_strip_model, change,
+                                                selection);
     }
   }
 

chrome/browser/ui/toolbar/toolbar_actions_bar.cc

@@ -769,12 +769,15 @@ void ToolbarActionsBar::OnToolbarModelInitialized() {
   ResizeDelegate(gfx::Tween::EASE_OUT);
 }
 
-void ToolbarActionsBar::TabInsertedAt(TabStripModel* tab_strip_model,
-                                      content::WebContents* contents,
-                                      int index,
-                                      bool foreground) {
-  if (foreground)
-    extensions::MaybeShowExtensionControlledNewTabPage(browser_, contents);
+void ToolbarActionsBar::OnTabStripModelChanged(
+    TabStripModel* tab_strip_model,
+    const TabStripModelChange& change,
+    const TabStripSelectionChange& selection) {
+  if (tab_strip_model->empty() || !selection.active_tab_changed())
+    return;
+
+  extensions::MaybeShowExtensionControlledNewTabPage(browser_,
+                                                     selection.new_contents);
 }
 
 void ToolbarActionsBar::ReorderActions() {

chrome/browser/ui/toolbar/toolbar_actions_bar.h

@@ -283,10 +283,10 @@ class ToolbarActionsBar : public ToolbarActionsModel::Observer,
   void OnToolbarModelInitialized() override;
 
   // TabStripModelObserver:
-  void TabInsertedAt(TabStripModel* tab_strip_model,
-                     content::WebContents* contents,
-                     int index,
-                     bool foreground) override;
+  void OnTabStripModelChanged(
+      TabStripModel* tab_strip_model,
+      const TabStripModelChange& change,
+      const TabStripSelectionChange& selection) override;
 
   // Resizes the delegate (if necessary) to the preferred size using the given
   // |tween_type|.

chrome/browser/ui/views/close_bubble_on_tab_activation_helper.cc

@@ -18,11 +18,13 @@ CloseBubbleOnTabActivationHelper::CloseBubbleOnTabActivationHelper(
 
 CloseBubbleOnTabActivationHelper::~CloseBubbleOnTabActivationHelper() = default;
 
-void CloseBubbleOnTabActivationHelper::ActiveTabChanged(
-    content::WebContents* old_contents,
-    content::WebContents* new_contents,
-    int index,
-    int reason) {
+void CloseBubbleOnTabActivationHelper::OnTabStripModelChanged(
+    TabStripModel* tab_strip_model,
+    const TabStripModelChange& change,
+    const TabStripSelectionChange& selection) {
+  if (tab_strip_model->empty() || !selection.active_tab_changed())
+    return;
+
   if (owner_bubble_) {
     views::Widget* bubble_widget = owner_bubble_->GetWidget();
     if (bubble_widget)

chrome/browser/ui/views/close_bubble_on_tab_activation_helper.h

@@ -27,10 +27,10 @@ class CloseBubbleOnTabActivationHelper : public TabStripModelObserver {
   ~CloseBubbleOnTabActivationHelper() override;
 
   // TabStripModelObserver:
-  void ActiveTabChanged(content::WebContents* old_contents,
-                        content::WebContents* new_contents,
-                        int index,
-                        int reason) override;
+  void OnTabStripModelChanged(
+      TabStripModel* tab_strip_model,
+      const TabStripModelChange& change,
+      const TabStripSelectionChange& selection) override;
 
  private:
   views::BubbleDialogDelegateView* owner_bubble_;  // weak, owns me.

chrome/browser/ui/views/extensions/extension_popup.cc

@@ -158,10 +158,13 @@ void ExtensionPopup::OnWidgetActivationChanged(views::Widget* widget,
     CloseUnlessUnderInspection();
 }
 
-void ExtensionPopup::ActiveTabChanged(content::WebContents* old_contents,
-                                      content::WebContents* new_contents,
-                                      int index,
-                                      int reason) {
+void ExtensionPopup::OnTabStripModelChanged(
+    TabStripModel* tab_strip_model,
+    const TabStripModelChange& change,
+    const TabStripSelectionChange& selection) {
+  if (tab_strip_model->empty() || !selection.active_tab_changed())
+    return;
+
   GetWidget()->Close();
 }
 

chrome/browser/ui/views/extensions/extension_popup.h

@@ -79,10 +79,10 @@ class ExtensionPopup : public views::BubbleDialogDelegateView,
   void OnWidgetActivationChanged(views::Widget* widget, bool active) override;
 
   // TabStripModelObserver overrides.
-  void ActiveTabChanged(content::WebContents* old_contents,
-                        content::WebContents* new_contents,
-                        int index,
-                        int reason) override;
+  void OnTabStripModelChanged(
+      TabStripModel* tab_strip_model,
+      const TabStripModelChange& change,
+      const TabStripSelectionChange& selection) override;
 
   // The min/max height of popups.
   static const int kMinWidth;

chrome/browser/ui/views/toolbar/browser_app_menu_button.cc

@@ -153,10 +153,13 @@ void BrowserAppMenuButton::OnThemeChanged() {
   UpdateIcon(false);
 }
 
-void BrowserAppMenuButton::TabInsertedAt(TabStripModel* tab_strip_model,
-                                         content::WebContents* contents,
-                                         int index,
-                                         bool foreground) {
+void BrowserAppMenuButton::OnTabStripModelChanged(
+    TabStripModel* tab_strip_model,
+    const TabStripModelChange& change,
+    const TabStripSelectionChange& selection) {
+  if (change.type() != TabStripModelChange::kInserted)
+    return;
+
   AnimateIconIfPossible(true);
 }
 

chrome/browser/ui/views/toolbar/browser_app_menu_button.h

@@ -55,10 +55,10 @@ class BrowserAppMenuButton : public AppMenuButton,
   void OnThemeChanged() override;
 
   // TabStripObserver:
-  void TabInsertedAt(TabStripModel* tab_strip_model,
-                     content::WebContents* contents,
-                     int index,
-                     bool foreground) override;
+  void OnTabStripModelChanged(
+      TabStripModel* tab_strip_model,
+      const TabStripModelChange& change,
+      const TabStripSelectionChange& selection) override;
 
   // Updates the presentation according to |severity_| and the theme provider.
   // If |should_animate| is true, the icon should animate.

chrome/browser/usb/web_usb_detector.cc

@@ -103,11 +103,14 @@ class WebUsbNotificationDelegate : public TabStripModelObserver,
     browser_tab_strip_tracker_.Init();
   }
 
-  void ActiveTabChanged(content::WebContents* old_contents,
-                        content::WebContents* new_contents,
-                        int index,
-                        int reason) override {
-    if (new_contents->GetURL() == landing_page_) {
+  void OnTabStripModelChanged(
+      TabStripModel* tab_strip_model,
+      const TabStripModelChange& change,
+      const TabStripSelectionChange& selection) override {
+    if (tab_strip_model->empty() || !selection.active_tab_changed())
+      return;
+
+    if (selection.new_contents->GetURL() == landing_page_) {
       // If the disposition is not already set, go ahead and set it.
       if (disposition_ == WEBUSB_NOTIFICATION_CLOSED)
         disposition_ = WEBUSB_NOTIFICATION_CLOSED_MANUAL_NAVIGATION;