Miscellaneous cleanup.

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

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_TABS_TAB_STRIP_H_
 #define CHROME_BROWSER_UI_VIEWS_TABS_TAB_STRIP_H_
 
 #include <vector>
 
 #include "base/compiler_specific.h"
@@ skipping 39 matching lines @@
 //      DraggedTab, focusing on tasks that require reshuffling other tabs
 //      in response to dragged tabs.
 //
 ///////////////////////////////////////////////////////////////////////////////
 class TabStrip : public views::View,
                  public views::ButtonListener,
                  public views::MouseWatcherListener,
                  public views::ViewTargeterDelegate,
                  public TabController {
  public:
-  static const char kViewClassName[];
-
-  // Horizontal offset for the new tab button to bring it closer to the
-  // rightmost tab.
-  static const int kNewTabButtonHorizontalOffset;
-
   // The vertical offset of the tab strip button. This offset applies only to
   // restored windows.
   static const int kNewTabButtonVerticalOffset;
 
   // The size of the new tab button must be hardcoded because we need to be
   // able to lay it out before we are able to get its image from the
   // ui::ThemeProvider.  It also makes sense to do this, because the size of the
   // new tab button should not need to be calculated dynamically.
   static const int kNewTabButtonAssetWidth;
-  static const int kNewTabButtonAssetHeight;
 
   explicit TabStrip(TabStripController* controller);
   ~TabStrip() override;
 
   // Add and remove observers to changes within this TabStrip.
   void AddObserver(TabStripObserver* observer);
   void RemoveObserver(TabStripObserver* observer);
 
   // If |adjust_layout| is true the stacked layout changes based on whether the
   // user uses a mouse or a touch device with the tabstrip.
@@ skipping 404 matching lines @@
 
   // Generates the ideal bounds for each of the tabs as well as the new tab
   // button.
   void GenerateIdealBounds();
 
   // Generates the ideal bounds for the pinned tabs. Returns the index to
   // position the first non-pinned tab and sets |first_non_pinned_index| to the
   // index of the first non-pinned tab.
   int GenerateIdealBoundsForPinnedTabs(int* first_non_pinned_index);
 
-  // Returns the width needed for the new tab button (and padding).
-  static int new_tab_button_width() {
-    return kNewTabButtonAssetWidth + kNewTabButtonHorizontalOffset;
-  }
-
   // Returns the width of the area that contains tabs. This does not include
   // the width of the new tab button.
-  int tab_area_width() const { return width() - new_tab_button_width(); }
+  int GetTabAreaWidth() const;
 
   // Starts various types of TabStrip animations.
   void StartResizeLayoutAnimation();
   void StartPinnedTabAnimation();
   void StartMouseInitiatedRemoveTabAnimation(int model_index);
 
   // Returns true if the specified point in TabStrip coords is within the
   // hit-test region of the specified Tab.
   bool IsPointInTab(Tab* tab, const gfx::Point& point_in_tabstrip_coords);
 
@@ skipping 139 matching lines @@
   bool immersive_style_;
 
   // Our observers.
   typedef base::ObserverList<TabStripObserver> TabStripObservers;
   TabStripObservers observers_;
 
   DISALLOW_COPY_AND_ASSIGN(TabStrip);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_TABS_TAB_STRIP_H_