Add TabStripModel as a parameter of some functions in TabStripModelObserver

The affected function are TabInsertedAt() and TabPinnedStateChanged().

This change includes no functional changes and it will be used in a
subsequent CL.

Review-Url: https://codereview.chromium.org/2354673004
Cr-Commit-Position: refs/heads/master@{#419872}

chrome/browser/devtools/devtools_auto_opener.cc

@@ -16,10 +16,10 @@ DevToolsAutoOpener::DevToolsAutoOpener()
 DevToolsAutoOpener::~DevToolsAutoOpener() {
 }
 
-void DevToolsAutoOpener::TabInsertedAt(
-    content::WebContents* contents,
-    int index,
-    bool foreground) {
+void DevToolsAutoOpener::TabInsertedAt(TabStripModel* tab_strip_model,
+                                       content::WebContents* contents,
+                                       int index,
+                                       bool foreground) {
   if (!DevToolsWindow::IsDevToolsWindow(contents))
     DevToolsWindow::OpenDevToolsWindow(contents);
 }

chrome/browser/devtools/devtools_auto_opener.h

@@ -15,7 +15,8 @@ class DevToolsAutoOpener : public TabStripModelObserver {
 
  private:
   // TabStripModelObserver overrides.
-  void TabInsertedAt(content::WebContents* contents,
+  void TabInsertedAt(TabStripModel* tab_strip_model,
+                     content::WebContents* contents,
                      int index,
                      bool foreground) override;
 

chrome/browser/devtools/global_confirm_info_bar.cc

@@ -7,6 +7,7 @@
 #include <utility>
 
 #include "base/macros.h"
+#include "base/stl_util.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "components/infobars/core/infobar.h"
@@ -160,36 +161,17 @@ GlobalConfirmInfoBar::~GlobalConfirmInfoBar() {
   }
 }
 
-void GlobalConfirmInfoBar::TabInsertedAt(content::WebContents* web_contents,
+void GlobalConfirmInfoBar::TabInsertedAt(TabStripModel* tab_strip_model,
+                                         content::WebContents* web_contents,
                                          int index,
                                          bool foreground) {
-  InfoBarService* infobar_service =
-      InfoBarService::FromWebContents(web_contents);
-  // WebContents from the tab strip must have the infobar service.
-  DCHECK(infobar_service);
-  if (proxies_.find(infobar_service) != proxies_.end())
-      return;
-
-  std::unique_ptr<GlobalConfirmInfoBar::DelegateProxy> proxy(
-      new GlobalConfirmInfoBar::DelegateProxy(weak_factory_.GetWeakPtr()));
-  GlobalConfirmInfoBar::DelegateProxy* proxy_ptr = proxy.get();
-  infobars::InfoBar* added_bar = infobar_service->AddInfoBar(
-      infobar_service->CreateConfirmInfoBar(std::move(proxy)));
-
-  proxy_ptr->info_bar_ = added_bar;
-  DCHECK(added_bar);
-  proxies_[infobar_service] = proxy_ptr;
-  infobar_service->AddObserver(this);
+  MaybeAddInfoBar(web_contents);
 }
 
 void GlobalConfirmInfoBar::TabChangedAt(content::WebContents* web_contents,
                                         int index,
                                         TabChangeType change_type) {
-  InfoBarService* infobar_service =
-      InfoBarService::FromWebContents(web_contents);
-  auto it = proxies_.find(infobar_service);
-  if (it == proxies_.end())
-    TabInsertedAt(web_contents, index, false);
+  MaybeAddInfoBar(web_contents);
 }
 
 void GlobalConfirmInfoBar::OnInfoBarRemoved(infobars::InfoBar* info_bar,
@@ -208,3 +190,23 @@ void GlobalConfirmInfoBar::OnManagerShuttingDown(
   manager->RemoveObserver(this);
   proxies_.erase(manager);
 }
+
+void GlobalConfirmInfoBar::MaybeAddInfoBar(content::WebContents* web_contents) {
+  InfoBarService* infobar_service =
+      InfoBarService::FromWebContents(web_contents);
+  // WebContents from the tab strip must have the infobar service.
+  DCHECK(infobar_service);
+  if (ContainsKey(proxies_, infobar_service))
+    return;
+
+  std::unique_ptr<GlobalConfirmInfoBar::DelegateProxy> proxy(
+      new GlobalConfirmInfoBar::DelegateProxy(weak_factory_.GetWeakPtr()));
+  GlobalConfirmInfoBar::DelegateProxy* proxy_ptr = proxy.get();
+  infobars::InfoBar* added_bar = infobar_service->AddInfoBar(
+      infobar_service->CreateConfirmInfoBar(std::move(proxy)));
+
+  proxy_ptr->info_bar_ = added_bar;
+  DCHECK(added_bar);
+  proxies_[infobar_service] = proxy_ptr;
+  infobar_service->AddObserver(this);
+}

chrome/browser/devtools/global_confirm_info_bar.h

@@ -36,7 +36,8 @@ class GlobalConfirmInfoBar : public TabStripModelObserver,
   class DelegateProxy;
 
   // TabStripModelObserver:
-  void TabInsertedAt(content::WebContents* web_contents,
+  void TabInsertedAt(TabStripModel* tab_strip_model,
+                     content::WebContents* web_contents,
                      int index,
                      bool foreground) override;
   void TabChangedAt(content::WebContents* web_contents,
@@ -47,6 +48,9 @@ class GlobalConfirmInfoBar : public TabStripModelObserver,
   void OnInfoBarRemoved(infobars::InfoBar* info_bar, bool animate) override;
   void OnManagerShuttingDown(infobars::InfoBarManager* manager) override;
 
+  // Adds the info bar to the tab if it is missing.
+  void MaybeAddInfoBar(content::WebContents* web_contents);
+
   std::unique_ptr<ConfirmInfoBarDelegate> delegate_;
   std::map<infobars::InfoBarManager*, DelegateProxy*> proxies_;
   BrowserTabStripTracker browser_tab_strip_tracker_;

chrome/browser/extensions/api/tabs/tabs_event_router.cc

@@ -217,7 +217,8 @@ void TabsEventRouter::TabCreatedAt(WebContents* contents,
   RegisterForTabNotifications(contents);
 }
 
-void TabsEventRouter::TabInsertedAt(WebContents* contents,
+void TabsEventRouter::TabInsertedAt(TabStripModel* tab_strip_model,
+                                    WebContents* contents,
                                     int index,
                                     bool active) {
   if (!GetTabEntry(contents)) {
@@ -506,7 +507,9 @@ void TabsEventRouter::TabReplacedAt(TabStripModel* tab_strip_model,
     RegisterForTabNotifications(new_contents);
 }
 
-void TabsEventRouter::TabPinnedStateChanged(WebContents* contents, int index) {
+void TabsEventRouter::TabPinnedStateChanged(TabStripModel* tab_strip_model,
+                                            WebContents* contents,
+                                            int index) {
   std::set<std::string> changed_property_names;
   changed_property_names.insert(tabs_constants::kPinnedKey);
   DispatchTabUpdatedEvent(contents, std::move(changed_property_names));

chrome/browser/extensions/api/tabs/tabs_event_router.h

@@ -54,7 +54,8 @@ class TabsEventRouter : public TabStripModelObserver,
   void OnBrowserSetLastActive(Browser* browser) override;
 
   // TabStripModelObserver:
-  void TabInsertedAt(content::WebContents* contents,
+  void TabInsertedAt(TabStripModel* tab_strip_model,
+                     content::WebContents* contents,
                      int index,
                      bool active) override;
   void TabClosingAt(TabStripModel* tab_strip_model,
@@ -77,7 +78,8 @@ class TabsEventRouter : public TabStripModelObserver,
                      content::WebContents* old_contents,
                      content::WebContents* new_contents,
                      int index) override;
-  void TabPinnedStateChanged(content::WebContents* contents,
+  void TabPinnedStateChanged(TabStripModel* tab_strip_model,
+                             content::WebContents* contents,
                              int index) override;
 
   // ZoomObserver:

chrome/browser/memory/tab_manager.cc

@@ -798,7 +798,8 @@ void TabManager::ActiveTabChanged(content::WebContents* old_contents,
     GetWebContentsData(old_contents)->SetLastInactiveTime(NowTicks());
 }
 
-void TabManager::TabInsertedAt(content::WebContents* contents,
+void TabManager::TabInsertedAt(TabStripModel* tab_strip_model,
+                               content::WebContents* contents,
                                int index,
                                bool foreground) {
   // Only interested in background tabs, as foreground tabs get taken care of by

chrome/browser/memory/tab_manager.h

@@ -264,7 +264,8 @@ class TabManager : public TabStripModelObserver {
                         content::WebContents* new_contents,
                         int index,
                         int reason) override;
-  void TabInsertedAt(content::WebContents* contents,
+  void TabInsertedAt(TabStripModel* tab_strip_model,
+                     content::WebContents* contents,
                      int index,
                      bool foreground) override;
 

chrome/browser/ui/ash/launcher/browser_status_monitor.cc

@@ -256,7 +256,8 @@ void BrowserStatusMonitor::TabReplacedAt(TabStripModel* tab_strip_model,
   AddWebContentsObserver(new_contents);
 }
 
-void BrowserStatusMonitor::TabInsertedAt(content::WebContents* contents,
+void BrowserStatusMonitor::TabInsertedAt(TabStripModel* tab_strip_model,
+                                         content::WebContents* contents,
                                          int index,
                                          bool foreground) {
   // An inserted tab is not active - ActiveTabChanged() will be called to

chrome/browser/ui/ash/launcher/browser_status_monitor.h

@@ -71,7 +71,8 @@ class BrowserStatusMonitor : public aura::client::ActivationChangeObserver,
                      content::WebContents* old_contents,
                      content::WebContents* new_contents,
                      int index) override;
-  void TabInsertedAt(content::WebContents* contents,
+  void TabInsertedAt(TabStripModel* tab_strip_model,
+                     content::WebContents* contents,
                      int index,
                      bool foreground) override;
   void TabClosingAt(TabStripModel* tab_strip_mode,

chrome/browser/ui/browser.cc

@@ -912,7 +912,8 @@ WebContents* Browser::OpenURL(const OpenURLParams& params) {
 ///////////////////////////////////////////////////////////////////////////////
 // Browser, TabStripModelObserver implementation:
 
-void Browser::TabInsertedAt(WebContents* contents,
+void Browser::TabInsertedAt(TabStripModel* tab_strip_model,
+                            WebContents* contents,
                             int index,
                             bool foreground) {
   SetAsDelegate(contents, true);
@@ -1085,8 +1086,7 @@ void Browser::TabReplacedAt(TabStripModel* tab_strip_model,
       SessionServiceFactory::GetForProfile(profile_);
   if (session_service)
     session_service->TabClosing(old_contents);
-  TabInsertedAt(new_contents,
-                index,
+  TabInsertedAt(tab_strip_model, new_contents, index,
                 (index == tab_strip_model_->active_index()));
 
   if (!new_contents->GetController().IsInitialBlankNavigation()) {
@@ -1104,7 +1104,9 @@ void Browser::TabReplacedAt(TabStripModel* tab_strip_model,
   }
 }
 
-void Browser::TabPinnedStateChanged(WebContents* contents, int index) {
+void Browser::TabPinnedStateChanged(TabStripModel* tab_strip_model,
+                                    WebContents* contents,
+                                    int index) {
   SessionService* session_service =
       SessionServiceFactory::GetForProfileIfExisting(profile());
   if (session_service) {

chrome/browser/ui/browser.h

@@ -428,7 +428,8 @@ class Browser : public TabStripModelObserver,
   content::WebContents* OpenURL(const content::OpenURLParams& params) override;
 
   // Overridden from TabStripModelObserver:
-  void TabInsertedAt(content::WebContents* contents,
+  void TabInsertedAt(TabStripModel* tab_strip_model,
+                     content::WebContents* contents,
                      int index,
                      bool foreground) override;
   void TabClosingAt(TabStripModel* tab_strip_model,
@@ -447,7 +448,8 @@ class Browser : public TabStripModelObserver,
                      content::WebContents* old_contents,
                      content::WebContents* new_contents,
                      int index) override;
-  void TabPinnedStateChanged(content::WebContents* contents,
+  void TabPinnedStateChanged(TabStripModel* tab_strip_model,
+                             content::WebContents* contents,
                              int index) override;
   void TabStripEmpty() override;
 

chrome/browser/ui/browser_command_controller.cc

@@ -663,7 +663,8 @@ void BrowserCommandController::OnSigninAllowedPrefChange() {
 
 // BrowserCommandController, TabStripModelObserver implementation:
 
-void BrowserCommandController::TabInsertedAt(WebContents* contents,
+void BrowserCommandController::TabInsertedAt(TabStripModel* tab_strip_model,
+                                             WebContents* contents,
                                              int index,
                                              bool foreground) {
   AddInterstitialObservers(contents);

chrome/browser/ui/browser_command_controller.h

@@ -84,7 +84,8 @@ class BrowserCommandController : public CommandUpdaterDelegate,
       override;
 
   // Overridden from TabStripModelObserver:
-  void TabInsertedAt(content::WebContents* contents,
+  void TabInsertedAt(TabStripModel* tab_strip_model,
+                     content::WebContents* contents,
                      int index,
                      bool foreground) override;
   void TabDetachedAt(content::WebContents* contents, int index) override;

chrome/browser/ui/browser_tab_strip_tracker.cc

@@ -71,7 +71,8 @@ void BrowserTabStripTracker::MaybeTrackBrowser(Browser* browser) {
   const int active_index = tab_strip_model->active_index();
   for (int i = 0; i < tab_strip_model->count(); ++i) {
     tab_strip_model_observer_->TabInsertedAt(
-        tab_strip_model->GetWebContentsAt(i), i, i == active_index);
+        tab_strip_model, tab_strip_model->GetWebContentsAt(i), i,
+        i == active_index);
   }
 }
 

chrome/browser/ui/cocoa/tabs/tab_strip_model_observer_bridge.h

@@ -27,7 +27,8 @@ class TabStripModelObserverBridge : public TabStripModelObserver {
   ~TabStripModelObserverBridge() override;
 
   // Overridden from TabStripModelObserver
-  void TabInsertedAt(content::WebContents* contents,
+  void TabInsertedAt(TabStripModel* tab_strip_model,
+                     content::WebContents* contents,
                      int index,
                      bool foreground) override;
   void TabClosingAt(TabStripModel* tab_strip_model,
@@ -51,7 +52,8 @@ class TabStripModelObserverBridge : public TabStripModelObserver {
                      content::WebContents* old_contents,
                      content::WebContents* new_contents,
                      int index) override;
-  void TabPinnedStateChanged(content::WebContents* contents,
+  void TabPinnedStateChanged(TabStripModel* tab_strip_model,
+                             content::WebContents* contents,
                              int index) override;
   void TabStripEmpty() override;
 

chrome/browser/ui/cocoa/tabs/tab_strip_model_observer_bridge.mm

@@ -22,7 +22,8 @@ TabStripModelObserverBridge::~TabStripModelObserverBridge() {
   model_->RemoveObserver(this);
 }
 
-void TabStripModelObserverBridge::TabInsertedAt(WebContents* contents,
+void TabStripModelObserverBridge::TabInsertedAt(TabStripModel* tab_strip_model,
+                                                WebContents* contents,
                                                 int index,
                                                 bool foreground) {
   if ([controller_ respondsToSelector:
@@ -112,8 +113,10 @@ void TabStripModelObserverBridge::TabReplacedAt(TabStripModel* tab_strip_model,
   }
 }
 
-void TabStripModelObserverBridge::TabPinnedStateChanged(WebContents* contents,
-                                                        int index) {
+void TabStripModelObserverBridge::TabPinnedStateChanged(
+    TabStripModel* tab_strip_model,
+    WebContents* contents,
+    int index) {
   if ([controller_ respondsToSelector:
           @selector(tabPinnedStateChangedWithContents:atIndex:)]) {
     [controller_ tabPinnedStateChangedWithContents:contents

chrome/browser/ui/fast_unload_controller.cc

@@ -288,7 +288,8 @@ void FastUnloadController::Observe(
 ////////////////////////////////////////////////////////////////////////////////
 // FastUnloadController, TabStripModelObserver implementation:
 
-void FastUnloadController::TabInsertedAt(content::WebContents* contents,
+void FastUnloadController::TabInsertedAt(TabStripModel* tab_strip_model,
+                                         content::WebContents* contents,
                                          int index,
                                          bool foreground) {
   TabAttachedImpl(contents);

chrome/browser/ui/fast_unload_controller.h

@@ -121,7 +121,8 @@ class FastUnloadController : public content::NotificationObserver,
                const content::NotificationDetails& details) override;
 
   // Overridden from TabStripModelObserver:
-  void TabInsertedAt(content::WebContents* contents,
+  void TabInsertedAt(TabStripModel* tab_strip_model,
+                     content::WebContents* contents,
                      int index,
                      bool foreground) override;
   void TabDetachedAt(content::WebContents* contents, int index) override;

chrome/browser/ui/tabs/tab_strip_model.cc

@@ -320,7 +320,7 @@ void TabStripModel::InsertWebContentsAt(int index,
   selection_model_.IncrementFrom(index);
 
   FOR_EACH_OBSERVER(TabStripModelObserver, observers_,
-                    TabInsertedAt(contents, index, active));
+                    TabInsertedAt(this, contents, index, active));
   if (active) {
     ui::ListSelectionModel new_model;
     new_model.Copy(selection_model_);
@@ -658,8 +658,8 @@ void TabStripModel::SetTabPinned(int index, bool pinned) {
   }
 
   FOR_EACH_OBSERVER(TabStripModelObserver, observers_,
-                    TabPinnedStateChanged(contents_data_[index]->web_contents(),
-                                          index));
+                    TabPinnedStateChanged(
+                        this, contents_data_[index]->web_contents(), index));
 }
 
 bool TabStripModel::IsTabPinned(int index) const {

chrome/browser/ui/tabs/tab_strip_model_observer.cc

@@ -6,7 +6,8 @@
 
 using content::WebContents;
 
-void TabStripModelObserver::TabInsertedAt(WebContents* contents,
+void TabStripModelObserver::TabInsertedAt(TabStripModel* tab_strip_model,
+                                          WebContents* contents,
                                           int index,
                                           bool foreground) {
 }
@@ -50,8 +51,10 @@ void TabStripModelObserver::TabReplacedAt(TabStripModel* tab_strip_model,
                                           int index) {
 }
 
-void TabStripModelObserver::TabPinnedStateChanged(WebContents* contents,
-                                                  int index) {
+void TabStripModelObserver::TabPinnedStateChanged(
+    TabStripModel* tab_strip_model,
+    WebContents* contents,
+    int index) {
 }
 
 void TabStripModelObserver::TabBlockedStateChanged(WebContents* contents,

chrome/browser/ui/tabs/tab_strip_model_observer.h

@@ -57,7 +57,8 @@ class TabStripModelObserver {
   // A new WebContents was inserted into the TabStripModel at the
   // specified index. |foreground| is whether or not it was opened in the
   // foreground (selected).
-  virtual void TabInsertedAt(content::WebContents* contents,
+  virtual void TabInsertedAt(TabStripModel* tab_strip_model,
+                             content::WebContents* contents,
                              int index,
                              bool foreground);
 
@@ -126,7 +127,9 @@ class TabStripModelObserver {
                              int index);
 
   // Invoked when the pinned state of a tab changes.
-  virtual void TabPinnedStateChanged(content::WebContents* contents, int index);
+  virtual void TabPinnedStateChanged(TabStripModel* tab_strip_model,
+                                     content::WebContents* contents,
+                                     int index);
 
   // Invoked when the blocked state of a tab changes.
   // NOTE: This is invoked when a tab becomes blocked/unblocked by a tab modal

chrome/browser/ui/tabs/tab_strip_model_unittest.cc

@@ -149,7 +149,8 @@ class TabBlockedStateTestBrowser
 
  private:
   // TabStripModelObserver
-  void TabInsertedAt(WebContents* contents,
+  void TabInsertedAt(TabStripModel* tab_strip_model,
+                     WebContents* contents,
                      int index,
                      bool foreground) override {
     web_modal::WebContentsModalDialogManager* manager =
@@ -347,7 +348,8 @@ class MockTabStripModelObserver : public TabStripModelObserver {
   }
 
   // TabStripModelObserver implementation:
-  void TabInsertedAt(WebContents* contents,
+  void TabInsertedAt(TabStripModel* tab_strip_model,
+                     WebContents* contents,
                      int index,
                      bool foreground) override {
     empty_ = false;
@@ -401,7 +403,9 @@ class MockTabStripModelObserver : public TabStripModelObserver {
     s.src_contents = old_contents;
     states_.push_back(s);
   }
-  void TabPinnedStateChanged(WebContents* contents, int index) override {
+  void TabPinnedStateChanged(TabStripModel* tab_strip_model,
+                             WebContents* contents,
+                             int index) override {
     states_.push_back(State(contents, index, PINNED));
   }
   void TabStripEmpty() override { empty_ = true; }

chrome/browser/ui/toolbar/toolbar_actions_bar.cc

@@ -793,7 +793,8 @@ void ToolbarActionsBar::OnToolbarModelInitialized() {
   ResizeDelegate(gfx::Tween::EASE_OUT, false);
 }
 
-void ToolbarActionsBar::TabInsertedAt(content::WebContents* contents,
+void ToolbarActionsBar::TabInsertedAt(TabStripModel* tab_strip_model,
+                                      content::WebContents* contents,
                                       int index,
                                       bool foreground) {
   if (foreground)

chrome/browser/ui/toolbar/toolbar_actions_bar.h

@@ -274,7 +274,8 @@ class ToolbarActionsBar : public ToolbarActionsModel::Observer,
   void OnToolbarModelInitialized() override;
 
   // TabStripModelObserver:
-  void TabInsertedAt(content::WebContents* contents,
+  void TabInsertedAt(TabStripModel* tab_strip_model,
+                     content::WebContents* contents,
                      int index,
                      bool foreground) override;
 

chrome/browser/ui/unload_controller.cc

@@ -225,7 +225,8 @@ void UnloadController::Observe(int type,
 ////////////////////////////////////////////////////////////////////////////////
 // UnloadController, TabStripModelObserver implementation:
 
-void UnloadController::TabInsertedAt(content::WebContents* contents,
+void UnloadController::TabInsertedAt(TabStripModel* tab_strip_model,
+                                     content::WebContents* contents,
                                      int index,
                                      bool foreground) {
   TabAttachedImpl(contents);

chrome/browser/ui/unload_controller.h

@@ -92,7 +92,8 @@ class UnloadController : public content::NotificationObserver,
                const content::NotificationDetails& details) override;
 
   // Overridden from TabStripModelObserver:
-  void TabInsertedAt(content::WebContents* contents,
+  void TabInsertedAt(TabStripModel* tab_strip_model,
+                     content::WebContents* contents,
                      int index,
                      bool foreground) override;
   void TabDetachedAt(content::WebContents* contents, int index) override;

chrome/browser/ui/views/ash/tab_scrubber_browsertest.cc

@@ -198,14 +198,6 @@ class TabScrubberTest : public InProcessBrowserTest,
   }
 
   // TabStripModelObserver overrides.
-  void TabInsertedAt(content::WebContents* contents,
-                     int index,
-                     bool foreground) override {}
-  void TabClosingAt(TabStripModel* tab_strip_model,
-                    content::WebContents* contents,
-                    int index) override {}
-  void TabDetachedAt(content::WebContents* contents, int index) override {}
-  void TabDeactivated(content::WebContents* contents) override {}
   void ActiveTabChanged(content::WebContents* old_contents,
                         content::WebContents* new_contents,
                         int index,
@@ -215,24 +207,6 @@ class TabScrubberTest : public InProcessBrowserTest,
       quit_closure_.Run();
   }
 
-  void TabSelectionChanged(TabStripModel* tab_strip_model,
-                           const ui::ListSelectionModel& old_model) override {}
-  void TabMoved(content::WebContents* contents,
-                int from_index,
-                int to_index) override {}
-  void TabChangedAt(content::WebContents* contents,
-                    int index,
-                    TabChangeType change_type) override {}
-  void TabReplacedAt(TabStripModel* tab_strip_model,
-                     content::WebContents* old_contents,
-                     content::WebContents* new_contents,
-                     int index) override {}
-  void TabPinnedStateChanged(content::WebContents* contents,
-                             int index) override {}
-  void TabBlockedStateChanged(content::WebContents* contents,
-                              int index) override {}
-  void TabStripEmpty() override {}
-
   // History of tab activation. Scrub() resets it.
   std::vector<int> activation_order_;
 

chrome/browser/ui/views/frame/browser_view.cc

@@ -1540,7 +1540,8 @@ ToolbarView* BrowserView::GetToolbarView() const {
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserView, TabStripModelObserver implementation:
 
-void BrowserView::TabInsertedAt(WebContents* contents,
+void BrowserView::TabInsertedAt(TabStripModel* tab_strip_model,
+                                WebContents* contents,
                                 int index,
                                 bool foreground) {
 #if defined(USE_AURA)

chrome/browser/ui/views/frame/browser_view.h

@@ -377,7 +377,8 @@ class BrowserView : public BrowserWindow,
   ToolbarView* GetToolbarView() const;
 
   // Overridden from TabStripModelObserver:
-  void TabInsertedAt(content::WebContents* contents,
+  void TabInsertedAt(TabStripModel* tab_strip_model,
+                     content::WebContents* contents,
                      int index,
                      bool foreground) override;
   void TabDetachedAt(content::WebContents* contents, int index) override;

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

@@ -422,7 +422,8 @@ SkColor BrowserTabStripController::GetToolbarTopSeparatorColor() const {
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserTabStripController, TabStripModelObserver implementation:
 
-void BrowserTabStripController::TabInsertedAt(WebContents* contents,
+void BrowserTabStripController::TabInsertedAt(TabStripModel* tab_strip_model,
+                                              WebContents* contents,
                                               int model_index,
                                               bool is_active) {
   DCHECK(contents);
@@ -475,8 +476,10 @@ void BrowserTabStripController::TabReplacedAt(TabStripModel* tab_strip_model,
   SetTabDataAt(new_contents, model_index);
 }
 
-void BrowserTabStripController::TabPinnedStateChanged(WebContents* contents,
-                                                      int model_index) {
+void BrowserTabStripController::TabPinnedStateChanged(
+    TabStripModel* tab_strip_model,
+    WebContents* contents,
+    int model_index) {
   SetTabDataAt(contents, model_index);
 }
 

chrome/browser/ui/views/tabs/browser_tab_strip_controller.h

@@ -78,7 +78,8 @@ class BrowserTabStripController : public TabStripController,
   SkColor GetToolbarTopSeparatorColor() const override;
 
   // TabStripModelObserver implementation:
-  void TabInsertedAt(content::WebContents* contents,
+  void TabInsertedAt(TabStripModel* tab_strip_model,
+                     content::WebContents* contents,
                      int model_index,
                      bool is_active) override;
   void TabDetachedAt(content::WebContents* contents, int model_index) override;
@@ -94,7 +95,8 @@ class BrowserTabStripController : public TabStripController,
                      content::WebContents* old_contents,
                      content::WebContents* new_contents,
                      int model_index) override;
-  void TabPinnedStateChanged(content::WebContents* contents,
+  void TabPinnedStateChanged(TabStripModel* tab_strip_model,
+                             content::WebContents* contents,
                              int model_index) override;
   void TabBlockedStateChanged(content::WebContents* contents,
                               int model_index) override;