diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-21 16:05:27 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-21 16:05:27 +0000 |
| commit | 9e5b66dccfe795fb2473230dd4deaef2253d6490 (patch) | |
| tree | 35fe1d73cbcd751dbad339ffcdc33392c11dc763 /views/controls/tabbed_pane/tabbed_pane.cc | |
| parent | 12bc28fcb86a370d67ee2a20895e9bbb008b7f86 (diff) | |
| download | chromium_src-9e5b66dccfe795fb2473230dd4deaef2253d6490.zip chromium_src-9e5b66dccfe795fb2473230dd4deaef2253d6490.tar.gz chromium_src-9e5b66dccfe795fb2473230dd4deaef2253d6490.tar.bz2 | |
views: Get rid of TabbedPane::CreateWrapper().
This is called only once, better to inline it in the call site, less code.
R=sky@chromium.org
Review URL: http://codereview.chromium.org/7981019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102111 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls/tabbed_pane/tabbed_pane.cc')
| -rw-r--r-- | views/controls/tabbed_pane/tabbed_pane.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/views/controls/tabbed_pane/tabbed_pane.cc b/views/controls/tabbed_pane/tabbed_pane.cc index 28920f4..3dec215 100644 --- a/views/controls/tabbed_pane/tabbed_pane.cc +++ b/views/controls/tabbed_pane/tabbed_pane.cc @@ -71,10 +71,6 @@ gfx::Size TabbedPane::GetPreferredSize() { 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)); @@ -89,7 +85,9 @@ void TabbedPane::Layout() { 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(); } |