Re-land:

views/controls/tabbed_pane/native_tabbed_pane_gtk.cc

 // Copyright (c) 2011 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.
 
 #include "views/controls/tabbed_pane/native_tabbed_pane_gtk.h"
 
 #include <gtk/gtk.h>
 
 #include "base/logging.h"
 #include "base/stl_util-inl.h"
@@ skipping 59 matching lines @@
     // We are the last tab, select the previous one.
     if (index > 0) {
       SelectTabAt(index - 1);
     } else {
       // last tab. nothing to select.
     }
   }
 
   GtkWidget* page =
       gtk_notebook_get_nth_page(GTK_NOTEBOOK(native_view()), index);
-  WidgetGtk* widget =
-      static_cast<WidgetGtk*>(NativeWidget::GetNativeWidgetForNativeView(page));
+  Widget* widget =
+      NativeWidget::GetNativeWidgetForNativeView(page)->GetWidget();
 
   // detach the content view from widget so that we can delete widget
   // without destroying the content view.
   View* removed_tab = GetTabViewAt(index);
   widget->GetRootView()->RemoveChildView(removed_tab);
 
   // widget delete itself when native_view is deleted.
   gtk_notebook_remove_page(GTK_NOTEBOOK(native_view()), index);
 
   // Removing a tab might change the size of the tabbed pane.
@@ skipping 55 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeTabbedPaneGtk, private:
 void NativeTabbedPaneGtk::DoAddTabAtIndex(int index,
                                           const std::wstring& title,
                                           View* contents,
                                           bool select_if_first_tab) {
   int tab_count = GetTabCount();
   DCHECK(index <= tab_count);
 
-  Widget* page_container = Widget::CreateWidget();
+  Widget* page_container = new Widget;
   page_container->Init(
       Widget::InitParams(Widget::InitParams::TYPE_CONTROL));
   page_container->SetContentsView(contents);
   page_container->SetFocusTraversableParent(GetWidget()->GetFocusTraversable());
   page_container->SetFocusTraversableParentView(this);
   page_container->Show();
 
   if (!contents->background()) {
     GtkStyle* window_style =
         gtk_widget_get_style(page_container->GetNativeView());
@@ skipping 20 matching lines @@
 
   if (tab_count == 0 && select_if_first_tab)
     gtk_notebook_set_current_page(GTK_NOTEBOOK(native_view()), 0);
 
   // Relayout the hierarchy, since the added tab might require more space.
   RootView* root_view = GetRootView();
   if (root_view)
     GetRootView()->Layout();
 }
 
-WidgetGtk* NativeTabbedPaneGtk::GetWidgetAt(int index) {
+Widget* NativeTabbedPaneGtk::GetWidgetAt(int index) {
   DCHECK(index <= GetTabCount());
   GtkWidget* page = gtk_notebook_get_nth_page(GTK_NOTEBOOK(native_view()),
                                               index);
-  WidgetGtk* widget =
-      static_cast<WidgetGtk*>(NativeWidget::GetNativeWidgetForNativeView(page));
+  Widget* widget =
+      NativeWidget::GetNativeWidgetForNativeView(page)->GetWidget();
   DCHECK(widget);
   return widget;
 }
 
 View* NativeTabbedPaneGtk::GetTabViewAt(int index) {
-  WidgetGtk* widget = GetWidgetAt(index);
+  Widget* widget = GetWidgetAt(index);
   DCHECK(widget && widget->GetRootView()->child_count() == 1);
   return widget->GetRootView()->GetChildViewAt(0);
 }
 
 void NativeTabbedPaneGtk::OnSwitchPage(int selected_tab_index) {
   TabbedPaneListener* listener = tabbed_pane_->listener();
   if (listener != NULL)
     listener->TabSelectedAt(selected_tab_index);
 }
 
 // static
 void NativeTabbedPaneGtk::CallSwitchPage(GtkNotebook* widget,
                                          GtkNotebookPage* page,
                                          guint selected_tab_index,
                                          NativeTabbedPaneGtk* tabbed_pane) {
   tabbed_pane->OnSwitchPage(selected_tab_index);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeTabbedPaneWrapper, public:
 
 // static
 NativeTabbedPaneWrapper* NativeTabbedPaneWrapper::CreateNativeWrapper(
     TabbedPane* tabbed_pane) {
   return new NativeTabbedPaneGtk(tabbed_pane);
 }
 
 }  // namespace views