views: add focus to TabbedPane

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 16 matching lines @@
   ~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 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.
   void AddTab(const base::string16& title, View* contents);
 
   // Adds a new tab at |index| with |title|. |contents| is the view displayed
   // when the tab is selected and is owned by the TabbedPane. If the tabbed pane
   // is currently empty, the new tab is selected.
   void AddTabAtIndex(int index, const base::string16& title, View* contents);
 
   // Selects the tab at |index|, which must be valid.
   void SelectTabAt(int index);
 
   // Selects |tab| (the tabstrip view, not its content) if it is valid.
   void SelectTab(Tab* tab);
 
   // Overridden from View:
   gfx::Size GetPreferredSize() const override;
   const char* GetClassName() const override;
 
+  // Returns the content View of the currently selected Tab.
+  View* GetSelectedTabViewForTesting();

[sky, 2016/10/05 20:00:22]

I'm not a fan of ForTesting public functions. They clutter the API. Can you
friend the test?

[Elly Fong-Jones, 2016/10/06 16:15:30]

Done.

+
+  // Gets the currently selected Tab (returned as a View, because the Tab class
+  // is private).
+  View* GetSelectedTabForTesting();
+
  private:
   friend class TabStrip;
 
   // 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();
+
+  // 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;
+  bool OnKeyPressed(const ui::KeyEvent& event) override;
   void GetAccessibleState(ui::AXViewState* state) override;
 
   // A listener notified when tab selection changes. Weak, not owned.
   TabbedPaneListener* listener_;
 
   // The tab strip and contents container. The child indices of these members
   // correspond to match each Tab with its respective content View.
   TabStrip* tab_strip_;
   View* contents_;
 
   // The selected tab index or -1 if invalid.
   int selected_tab_index_;
 
   DISALLOW_COPY_AND_ASSIGN(TabbedPane);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_CONTROLS_TABBED_PANE_TABBED_PANE_H_