From 6fe8795d9022105a0061a0a81be9a49d49fda345 Mon Sep 17 00:00:00 2001 From: dsinclair Date: Tue, 1 Nov 2016 18:48:19 -0700 Subject: Fold IFWL*::{Initialize|Finalize} into constructor/destructor This Cl moves the ::Initialize method into the constructors and the ::Finalize method into the destructors. The |m_pDelegate| is made private and a unique_ptr. A |SetDelegate| and |GetDelegate| method are added. Review-Url: https://codereview.chromium.org/2464703006 --- xfa/fwl/core/cfwl_combobox.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'xfa/fwl/core/cfwl_combobox.cpp') diff --git a/xfa/fwl/core/cfwl_combobox.cpp b/xfa/fwl/core/cfwl_combobox.cpp index ed5262ee29..3d45842872 100644 --- a/xfa/fwl/core/cfwl_combobox.cpp +++ b/xfa/fwl/core/cfwl_combobox.cpp @@ -8,6 +8,7 @@ #include +#include "third_party/base/ptr_util.h" #include "xfa/fwl/core/fwl_error.h" #include "xfa/fwl/core/ifwl_widget.h" @@ -30,11 +31,9 @@ CFWL_ComboBox::~CFWL_ComboBox() {} void CFWL_ComboBox::Initialize() { ASSERT(!m_pIface); - std::unique_ptr pComboBox(new IFWL_ComboBox( - m_pApp, m_pProperties->MakeWidgetImpProperties(&m_comboBoxData))); - pComboBox->Initialize(); + m_pIface = pdfium::MakeUnique( + m_pApp, m_pProperties->MakeWidgetImpProperties(&m_comboBoxData)); - m_pIface = std::move(pComboBox); CFWL_Widget::Initialize(); } -- cgit v1.2.3