Clean up tabstrip observer method names/args.

* Removed initial TabStrip* arg, no one was using it.
* Changed names from e.g. TabStripAddedTabAt() to OnTabAdded() to shorten and
  make consistent with other observer OnXXX() names.
* Changed TabStripMaxXChanged() to OnTabsMaxXChanged() in keeping with the
  meaning change in https://chromium-review.googlesource.com/c/chromium/src/+/1038789 .
* Changed override order in GlassBrowserFrameView to match base class.

BUG=none
TEST=none

Change-Id: Ibf29362d818d8f63e34c168d428173bca6e2a257
Reviewed-on: https://chromium-review.googlesource.com/1038796
Commit-Queue: Peter Kasting <pkasting@chromium.org>
Reviewed-by: Allen Bauer <kylixrd@chromium.org>
Cr-Commit-Position: refs/heads/master@{#555514}

chrome/browser/ui/ash/tab_scrubber.cc

@@ -179,7 +179,7 @@ void TabScrubber::Observe(int type,
   }
 }
 
-void TabScrubber::TabStripAddedTabAt(TabStrip* tab_strip, int index) {
+void TabScrubber::OnTabAdded(int index) {
   if (highlighted_tab_ == -1)
     return;
 
@@ -187,9 +187,7 @@ void TabScrubber::TabStripAddedTabAt(TabStrip* tab_strip, int index) {
     ++highlighted_tab_;
 }
 
-void TabScrubber::TabStripMovedTab(TabStrip* tab_strip,
-                                   int from_index,
-                                   int to_index) {
+void TabScrubber::OnTabMoved(int from_index, int to_index) {
   if (highlighted_tab_ == -1)
     return;
 
@@ -201,7 +199,7 @@ void TabScrubber::TabStripMovedTab(TabStrip* tab_strip,
     ++highlighted_tab_;
 }
 
-void TabScrubber::TabStripRemovedTabAt(TabStrip* tab_strip, int index) {
+void TabScrubber::OnTabRemoved(int index) {
   if (highlighted_tab_ == -1)
     return;
   if (index == highlighted_tab_) {

chrome/browser/ui/ash/tab_scrubber.h

@@ -60,11 +60,9 @@ class TabScrubber : public ui::EventHandler,
                const content::NotificationDetails& details) override;
 
   // TabStripObserver overrides.
-  void TabStripAddedTabAt(TabStrip* tab_strip, int index) override;
-  void TabStripMovedTab(TabStrip* tab_strip,
-                        int from_index,
-                        int to_index) override;
-  void TabStripRemovedTabAt(TabStrip* tab_strip, int index) override;
+  void OnTabAdded(int index) override;
+  void OnTabMoved(int from_index, int to_index) override;
+  void OnTabRemoved(int index) override;
 
   Browser* GetActiveBrowser();
 

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

@@ -382,7 +382,7 @@ AvatarButtonStyle BrowserNonClientFrameViewMus::GetAvatarButtonStyle() const {
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserNonClientFrameViewMus, private:
 
-void BrowserNonClientFrameViewMus::TabStripMaxXChanged(TabStrip* tab_strip) {
+void BrowserNonClientFrameViewMus::OnTabsMaxXChanged() {
   UpdateClientArea();
 }
 

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

@@ -68,7 +68,7 @@ class BrowserNonClientFrameViewMus : public BrowserNonClientFrameView,
 
  private:
   // TabStripObserver:
-  void TabStripMaxXChanged(TabStrip* tab_strip) override;
+  void OnTabsMaxXChanged() override;
 
   // Distance between the right edge of the NonClientFrameView and the tab
   // strip.

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

@@ -375,18 +375,17 @@ gfx::ImageSkia GlassBrowserFrameView::GetFaviconForTabIconView() {
   return frame()->widget_delegate()->GetWindowIcon();
 }
 
-void GlassBrowserFrameView::TabStripMaxXChanged(TabStrip* tab_strip) {
-  // The profile switcher button's height depends on the position of the new
-  // tab button.
+void GlassBrowserFrameView::OnTabRemoved(int index) {
+  // The profile switcher button may need to change height here, too.
+  // TabStripMaxXChanged is not enough when a tab other than the last tab is
+  // closed.
   if (browser_view()->IsRegularOrGuestSession())
     LayoutProfileSwitcher();
 }
 
-void GlassBrowserFrameView::TabStripRemovedTabAt(TabStrip* tab_strip,
-                                                 int index) {
-  // The profile switcher button may need to change height here, too.
-  // TabStripMaxXChanged is not enough when a tab other than the last tab is
-  // closed.
+void GlassBrowserFrameView::OnTabsMaxXChanged() {
+  // The profile switcher button's height depends on the position of the new
+  // tab button, which may have changed if the tabs max X changed.
   if (browser_view()->IsRegularOrGuestSession())
     LayoutProfileSwitcher();
 }

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

@@ -63,8 +63,8 @@ class GlassBrowserFrameView : public BrowserNonClientFrameView,
   gfx::ImageSkia GetFaviconForTabIconView() override;
 
   // TabStripObserver:
-  void TabStripMaxXChanged(TabStrip* tab_strip) override;
-  void TabStripRemovedTabAt(TabStrip* tab_strip, int index) override;
+  void OnTabRemoved(int index) override;
+  void OnTabsMaxXChanged() override;
 
   bool IsMaximized() const;
 

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

@@ -456,7 +456,7 @@ void TabStrip::AddTabAt(int model_index, TabRendererData data, bool is_active) {
   SwapLayoutIfNecessary();
 
   for (TabStripObserver& observer : observers_)
-    observer.TabStripAddedTabAt(this, model_index);
+    observer.OnTabAdded(model_index);
 
   // Stop dragging when a new tab is added and dragging a window. Doing
   // otherwise results in a confusing state if the user attempts to reattach. We
@@ -498,7 +498,7 @@ void TabStrip::MoveTab(int from_model_index,
   SwapLayoutIfNecessary();
 
   for (TabStripObserver& observer : observers_)
-    observer.TabStripMovedTab(this, from_model_index, to_model_index);
+    observer.OnTabMoved(from_model_index, to_model_index);
 }
 
 void TabStrip::RemoveTabAt(content::WebContents* contents, int model_index) {
@@ -520,7 +520,7 @@ void TabStrip::RemoveTabAt(content::WebContents* contents, int model_index) {
   SwapLayoutIfNecessary();
 
   for (TabStripObserver& observer : observers_)
-    observer.TabStripRemovedTabAt(this, model_index);
+    observer.OnTabRemoved(model_index);
 
   // Stop dragging when a new tab is removed and dragging a window. Doing
   // otherwise results in a confusing state if the user attempts to reattach. We
@@ -2162,7 +2162,7 @@ void TabStrip::GenerateIdealBounds() {
 
   if (GetTabsMaxX() != old_max_x) {
     for (TabStripObserver& observer : observers_)
-      observer.TabStripMaxXChanged(this);
+      observer.OnTabsMaxXChanged();
   }
 }
 

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

@@ -4,15 +4,10 @@
 
 #include "chrome/browser/ui/views/tabs/tab_strip_observer.h"
 
-void TabStripObserver::TabStripAddedTabAt(TabStrip* tab_strip, int index) {
-}
+void TabStripObserver::OnTabAdded(int index) {}
 
-void TabStripObserver::TabStripMovedTab(TabStrip* tab_strip,
-                                        int from_index,
-                                        int to_index) {
-}
+void TabStripObserver::OnTabMoved(int from_index, int to_index) {}
 
-void TabStripObserver::TabStripRemovedTabAt(TabStrip* tab_strip, int index) {
-}
+void TabStripObserver::OnTabRemoved(int index) {}
 
-void TabStripObserver::TabStripMaxXChanged(TabStrip* tab_strip) {}
+void TabStripObserver::OnTabsMaxXChanged() {}

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

@@ -22,19 +22,17 @@ class TabStrip;
 ////////////////////////////////////////////////////////////////////////////////
 class CHROME_VIEWS_EXPORT TabStripObserver {
  public:
-  // A new tab was added to |tab_strip| at |index|.
-  virtual void TabStripAddedTabAt(TabStrip* tab_strip, int index);
+  // Sent when a new tab has been added at |index|.
+  virtual void OnTabAdded(int index);
 
-  // The tab at |from_index| was moved to |to_index| in |tab_strip|.
-  virtual void TabStripMovedTab(TabStrip* tab_strip,
-                                int from_index,
-                                int to_index);
+  // Sent when the tab at |from_index| has been moved to |to_index|.
+  virtual void OnTabMoved(int from_index, int to_index);
 
-  // The tab at |index| was removed from |tab_strip|.
-  virtual void TabStripRemovedTabAt(TabStrip* tab_strip, int index);
+  // Sent when the tab at |index| has been removed.
+  virtual void OnTabRemoved(int index);
 
-  // tab_strip->max_x() has changed.
-  virtual void TabStripMaxXChanged(TabStrip* tab_strip);
+  // Sent when the trailing edge of the last tab has changed.
+  virtual void OnTabsMaxXChanged();
 
  protected:
   virtual ~TabStripObserver() {}

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

@@ -62,20 +62,14 @@ class TestTabStripObserver : public TabStripObserver {
 
  private:
   // TabStripObserver overrides.
-  void TabStripAddedTabAt(TabStrip* tab_strip, int index) override {
-    last_tab_added_ = index;
-  }
+  void OnTabAdded(int index) override { last_tab_added_ = index; }
 
-  void TabStripMovedTab(TabStrip* tab_strip,
-                        int from_index,
-                        int to_index) override {
+  void OnTabMoved(int from_index, int to_index) override {
     last_tab_moved_from_ = from_index;
     last_tab_moved_to_ = to_index;
   }
 
-  void TabStripRemovedTabAt(TabStrip* tab_strip, int index) override {
-    last_tab_removed_ = index;
-  }
+  void OnTabRemoved(int index) override { last_tab_removed_ = index; }
 
   TabStrip* tab_strip_;
   int last_tab_added_ = -1;