views: Get rid of TabbedPane::CreateWrapper().

views/controls/tabbed_pane/tabbed_pane.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/tabbed_pane.h"
 
 #include "base/logging.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 // TODO(avi): remove when not needed
 #include "base/utf_string_conversions.h"
@@ skipping 53 matching lines @@
 
 void TabbedPane::SetAccessibleName(const string16& name) {
   accessible_name_ = name;
 }
 
 gfx::Size TabbedPane::GetPreferredSize() {
   return native_tabbed_pane_ ?
       native_tabbed_pane_->GetPreferredSize() : gfx::Size();
 }
 
-void TabbedPane::CreateWrapper() {
-  native_tabbed_pane_ = NativeTabbedPaneWrapper::CreateNativeWrapper(this);
-}
-
 void TabbedPane::LoadAccelerators() {
   // Ctrl+Shift+Tab
   AddAccelerator(views::Accelerator(ui::VKEY_TAB, true, true, false));
   // Ctrl+Tab
   AddAccelerator(views::Accelerator(ui::VKEY_TAB, false, true, false));
 }
 
 void TabbedPane::Layout() {
   if (native_tabbed_pane_)
     native_tabbed_pane_->GetView()->SetBounds(0, 0, width(), height());
 }
 
 void TabbedPane::ViewHierarchyChanged(bool is_add, View* parent, View* child) {
   if (is_add && !native_tabbed_pane_) {
-    CreateWrapper();
+    // The native wrapper's lifetime will be managed by the view hierarchy after
+    // we call AddChildView.
+    native_tabbed_pane_ = NativeTabbedPaneWrapper::CreateNativeWrapper(this);
     AddChildView(native_tabbed_pane_->GetView());
     LoadAccelerators();
   }
 }
 
 bool TabbedPane::AcceleratorPressed(const views::Accelerator& accelerator) {
   // We only accept Ctrl+Tab keyboard events.
   DCHECK(accelerator.key_code() ==
       ui::VKEY_TAB && accelerator.IsCtrlDown());
 
@@ skipping 35 matching lines @@
   if (NativeViewHost::kRenderNativeControlFocus)
     View::OnPaintFocusBorder(canvas);
 }
 
 void TabbedPane::GetAccessibleState(ui::AccessibleViewState* state) {
   state->role = ui::AccessibilityTypes::ROLE_PAGETABLIST;
   state->name = accessible_name_;
 }
 
 }  // namespace views