Re-land r51526

views/controls/tabbed_pane/tabbed_pane.h

 // Copyright (c) 2010 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 VIEWS_CONTROLS_TABBED_PANE_H_
 #define VIEWS_CONTROLS_TABBED_PANE_H_
 
 #include "views/view.h"
 
 namespace views {
 
 class NativeTabbedPaneWrapper;
 
 // The TabbedPane class is a view that shows tabs.  When the user clicks on a
 // tab, the associated view is displayed.
-// TODO (jcampan): implement GetPreferredSize().
 
 class TabbedPane : public View {
  public:
   TabbedPane();
   virtual ~TabbedPane();
 
   // An interface an object can implement to be notified about events within
   // the TabbedPane.
   class Listener {
    public:
@@ skipping 38 matching lines @@
 
   // View overrides:
   virtual void ViewHierarchyChanged(bool is_add, View* parent, View* child);
   // Handles Ctrl+Tab and Ctrl+Shift+Tab navigation of pages.
   virtual bool AcceleratorPressed(const views::Accelerator& accelerator);
   virtual std::string GetClassName() const;
   virtual void Layout();
   virtual void Focus();
   virtual void PaintFocusBorder(gfx::Canvas* canvas);
   virtual bool GetAccessibleRole(AccessibilityTypes::Role* role);
+  virtual gfx::Size GetPreferredSize();
 
   NativeTabbedPaneWrapper* native_wrapper() const {
     return native_tabbed_pane_;
   }
 
  protected:
   // The object that actually implements the tabbed-pane.
   // Protected for tests access.
   NativeTabbedPaneWrapper* native_tabbed_pane_;
 
  private:
   // The tabbed-pane's class name.
   static const char kViewClassName[];
 
   // Creates the native wrapper.
   void CreateWrapper();
 
   // We support Ctrl+Tab and Ctrl+Shift+Tab to navigate tabbed option pages.
   void LoadAccelerators();
 
   // The listener we notify about tab selection changes.
   Listener* listener_;
 
   DISALLOW_COPY_AND_ASSIGN(TabbedPane);
 };
 
 }  // namespace views
 
 #endif  // VIEWS_CONTROLS_TABBED_PANE_H_