Re-land:

views/controls/tabbed_pane/native_tabbed_pane_win.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_win.h"
 
 #include <vssym32.h>
 
 #include "base/logging.h"
 #include "base/stl_util-inl.h"
@@ skipping 274 matching lines @@
                                       0, 0, width(), height(),
                                       GetWidget()->GetNativeView(), NULL, NULL,
                                       NULL);
   ui::CheckWindowCreated(tab_control);
 
   HFONT font = ResourceBundle::GetSharedInstance().
       GetFont(ResourceBundle::BaseFont).GetNativeFont();
   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();
+  content_window_ = new Widget;
   Widget::InitParams params(Widget::InitParams::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
   // property for the tabbed pane's HWND).
   if (base::i18n::IsRTL())
     l10n_util::HWNDSetRTLLayout(tab_control);
 
@@ skipping 92 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // NativeTabbedPaneWrapper, public:
 
 // static
 NativeTabbedPaneWrapper* NativeTabbedPaneWrapper::CreateNativeWrapper(
     TabbedPane* tabbed_pane) {
   return new NativeTabbedPaneWin(tabbed_pane);
 }
 
 }  // namespace views