summaryrefslogtreecommitdiffstats
path: root/views/controls/tabbed_pane
diff options
context:
space:
mode:
Diffstat (limited to 'views/controls/tabbed_pane')
-rw-r--r--views/controls/tabbed_pane/native_tabbed_pane_gtk.cc4
-rw-r--r--views/controls/tabbed_pane/native_tabbed_pane_win.cc7
2 files changed, 6 insertions, 5 deletions
diff --git a/views/controls/tabbed_pane/native_tabbed_pane_gtk.cc b/views/controls/tabbed_pane/native_tabbed_pane_gtk.cc
index df935db..d2286b3 100644
--- a/views/controls/tabbed_pane/native_tabbed_pane_gtk.cc
+++ b/views/controls/tabbed_pane/native_tabbed_pane_gtk.cc
@@ -154,9 +154,9 @@ void NativeTabbedPaneGtk::DoAddTabAtIndex(int index,
int tab_count = GetTabCount();
DCHECK(index <= tab_count);
- Widget* page_container = Widget::CreateWidget(
+ Widget* page_container = Widget::CreateWidget();
+ page_container->Init(
Widget::CreateParams(Widget::CreateParams::TYPE_CONTROL));
- page_container->Init(NULL, gfx::Rect());
page_container->SetContentsView(contents);
page_container->SetFocusTraversableParent(GetWidget()->GetFocusTraversable());
page_container->SetFocusTraversableParentView(this);
diff --git a/views/controls/tabbed_pane/native_tabbed_pane_win.cc b/views/controls/tabbed_pane/native_tabbed_pane_win.cc
index 91e053f..3d897f6 100644
--- a/views/controls/tabbed_pane/native_tabbed_pane_win.cc
+++ b/views/controls/tabbed_pane/native_tabbed_pane_win.cc
@@ -291,9 +291,10 @@ void NativeTabbedPaneWin::CreateNativeControl() {
SendMessage(tab_control, WM_SETFONT, reinterpret_cast<WPARAM>(font), FALSE);
// Create the view container which is a child of the TabControl.
- content_window_ = Widget::CreateWidget(
- Widget::CreateParams(Widget::CreateParams::TYPE_CONTROL));
- content_window_->Init(tab_control, gfx::Rect());
+ content_window_ = Widget::CreateWidget();
+ Widget::CreateParams params(Widget::CreateParams::TYPE_CONTROL);
+ params.parent = tab_control;
+ content_window_->Init(params);
// Explicitly setting the WS_EX_LAYOUTRTL property for the HWND (see above
// for why we waited until |content_window_| is created before we set this