TabbedPane: refactor away manual layout and selected_tab_index_

ui/views/controls/tabbed_pane/tabbed_pane.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 UI_VIEWS_CONTROLS_TABBED_PANE_TABBED_PANE_H_
 #define UI_VIEWS_CONTROLS_TABBED_PANE_TABBED_PANE_H_
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/strings/string16.h"
@@ skipping 12 matching lines @@
  public:
   // Internal class name.
   static const char kViewClassName[];
 
   TabbedPane();
   ~TabbedPane() override;
 
   TabbedPaneListener* listener() const { return listener_; }
   void set_listener(TabbedPaneListener* listener) { listener_ = listener; }
 
-  int selected_tab_index() const { return selected_tab_index_; }
+  // Returns the index of the currently selected tab, or -1 if no tab is
+  // selected.
+  int GetSelectedTabIndex() const;
 
   // Returns the number of tabs.
   int GetTabCount();
 
   // Adds a new tab at the end of this TabbedPane with the specified |title|.
   // |contents| is the view displayed when the tab is selected and is owned by
   // the TabbedPane.
   void AddTab(const base::string16& title, View* contents);
 
   // Adds a new tab at |index| with |title|. |contents| is the view displayed
@@ skipping 67 matching lines @@
 
   bool selected() const { return contents_->visible(); }
   void SetSelected(bool selected);
 
   // Overridden from View:
   bool OnMousePressed(const ui::MouseEvent& event) override;
   void OnMouseEntered(const ui::MouseEvent& event) override;
   void OnMouseExited(const ui::MouseEvent& event) override;
   void OnGestureEvent(ui::GestureEvent* event) override;
   gfx::Size GetPreferredSize() const override;
-  void Layout() override;
   const char* GetClassName() const override;
   void OnFocus() override;
   void OnBlur() override;
   bool OnKeyPressed(const ui::KeyEvent& event) override;
 
  protected:
   Label* title() { return title_; }
 
   // Called whenever |tab_state_| changes.
   virtual void OnStateChanged();
 
-  // Returns whether the containing TabStrip has focus.
-  bool ContainerHasFocus();
-
  private:
   enum TabState {
     TAB_INACTIVE,
     TAB_ACTIVE,
     TAB_HOVERED,
   };
 
   void SetState(TabState tab_state);
 
   TabbedPane* tabbed_pane_;
   Label* title_;
   gfx::Size preferred_title_size_;
   TabState tab_state_;
   // The content view associated with this tab.
   View* contents_;
 
   DISALLOW_COPY_AND_ASSIGN(Tab);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_CONTROLS_TABBED_PANE_TABBED_PANE_H_