Re-land r51526

views/controls/tabbed_pane/tabbed_pane.cc

Index: views/controls/tabbed_pane/tabbed_pane.cc
diff --git a/views/controls/tabbed_pane/tabbed_pane.cc b/views/controls/tabbed_pane/tabbed_pane.cc
index 5cb570a881a5fd8e2b3712ef3046de3ebe5b148f..1a7b0f07df5e2ad02e5eeaeeb240bb35521b0cb6 100644
--- a/views/controls/tabbed_pane/tabbed_pane.cc
+++ b/views/controls/tabbed_pane/tabbed_pane.cc
@@ -102,10 +102,8 @@ void TabbedPane::LoadAccelerators() {
 }
 
 void TabbedPane::Layout() {
-  if (native_tabbed_pane_) {
+  if (native_tabbed_pane_)
     native_tabbed_pane_->GetView()->SetBounds(0, 0, width(), height());
-    native_tabbed_pane_->GetView()->Layout();
-  }
 }
 
 void TabbedPane::Focus() {
@@ -129,4 +127,9 @@ bool TabbedPane::GetAccessibleRole(AccessibilityTypes::Role* role) {
   return true;
 }
 
+gfx::Size TabbedPane::GetPreferredSize() {
+  return native_tabbed_pane_ ?
+      native_tabbed_pane_->GetPreferredSize() : gfx::Size();
+}
+
 }  // namespace views