summaryrefslogtreecommitdiffstats
path: root/views/controls/tabbed_pane/tabbed_pane.cc
diff options
context:
space:
mode:
Diffstat (limited to 'views/controls/tabbed_pane/tabbed_pane.cc')
-rw-r--r--views/controls/tabbed_pane/tabbed_pane.cc9
1 files changed, 6 insertions, 3 deletions
diff --git a/views/controls/tabbed_pane/tabbed_pane.cc b/views/controls/tabbed_pane/tabbed_pane.cc
index 5cb570a..1a7b0f0 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