views: add focus to TabbedPane

ui/views/controls/tabbed_pane/tabbed_pane.h

Index: ui/views/controls/tabbed_pane/tabbed_pane.h
diff --git a/ui/views/controls/tabbed_pane/tabbed_pane.h b/ui/views/controls/tabbed_pane/tabbed_pane.h
index aa808acadcb1f439f215433e0b6c20423b88ab77..fbf1e3b4a3cee069e9a44baa26659cd3c7ccf957 100644
--- a/ui/views/controls/tabbed_pane/tabbed_pane.h
+++ b/ui/views/controls/tabbed_pane/tabbed_pane.h
@@ -34,9 +34,6 @@ class VIEWS_EXPORT TabbedPane : public View {
   // Returns the number of tabs.
   int GetTabCount();
 
-  // Returns the contents of the selected tab or NULL if there is none.
-  View* GetSelectedTab();
-
   // 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.
@@ -58,17 +55,36 @@ class VIEWS_EXPORT TabbedPane : public View {
   const char* GetClassName() const override;
 
  private:
+  friend class FocusTraversalTest;
+  friend class Tab;
   friend class TabStrip;
+  FRIEND_TEST_ALL_PREFIXES(TabbedPaneTest, AddAndSelect);
+  FRIEND_TEST_ALL_PREFIXES(TabbedPaneTest, ArrowKeyBindings);
 
   // Get the Tab (the tabstrip view, not its content) at the valid |index|.
   Tab* GetTabAt(int index);
 
+  // Get the Tab (the tabstrip view, not its content) at the selected index.
+  Tab* GetSelectedTab();
+
+  // Returns the content View of the currently selected Tab.
+  View* GetSelectedTabContentView();

[sky, 2016/10/06 21:14:40]

Ick! Why not move the declaration of tab to this header so you don't weirdly
duplicated functions?

[Elly Fong-Jones, 2016/10/07 17:18:24]

Done.

+
+  // Gets the currently selected Tab (returned as a View, because the Tab class
+  // is private).
+  View* GetSelectedTabAsView();
+
+  // Moves the selection by |delta| tabs, where negative delta means leftwards
+  // and positive delta means rightwards. Returns whether the selection could be
+  // moved by that amount; the only way this can fail is if there is only one
+  // tab.
+  bool MoveSelectionBy(int delta);
+
   // Overridden from View:
   void Layout() override;
   void ViewHierarchyChanged(
       const ViewHierarchyChangedDetails& details) override;
   bool AcceleratorPressed(const ui::Accelerator& accelerator) override;
-  void OnFocus() override;
   void GetAccessibleState(ui::AXViewState* state) override;
 
   // A listener notified when tab selection changes. Weak, not owned.