Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1783)

Unified Diff: xfa/fwl/core/ifwl_form.cpp

Issue 2464703006: Fold IFWL*::{Initialize|Finalize} into constructor/destructor (Closed)
Patch Set: Rebase to master Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « xfa/fwl/core/ifwl_form.h ('k') | xfa/fwl/core/ifwl_formproxy.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: xfa/fwl/core/ifwl_form.cpp
diff --git a/xfa/fwl/core/ifwl_form.cpp b/xfa/fwl/core/ifwl_form.cpp
index 2ded30e6d682289ab4a30d31c97ece58a1ce1f00..125f7c4cab46a46884dbc2456bd2970ec4239e69 100644
--- a/xfa/fwl/core/ifwl_form.cpp
+++ b/xfa/fwl/core/ifwl_form.cpp
@@ -6,6 +6,7 @@
#include "xfa/fwl/core/ifwl_form.h"
+#include "third_party/base/ptr_util.h"
#include "xfa/fde/tto/fde_textout.h"
#include "xfa/fwl/core/cfwl_message.h"
#include "xfa/fwl/core/cfwl_themebackground.h"
@@ -64,26 +65,16 @@ IFWL_Form::IFWL_Form(const IFWL_App* app,
m_rtRestore.Reset();
m_rtCaptionText.Reset();
m_rtIcon.Reset();
-}
-
-IFWL_Form::~IFWL_Form() {
- RemoveSysButtons();
-}
-
-void IFWL_Form::Initialize() {
- IFWL_Widget::Initialize();
RegisterForm();
RegisterEventTarget();
- m_pDelegate = new CFWL_FormImpDelegate(this);
+ SetDelegate(pdfium::MakeUnique<CFWL_FormImpDelegate>(this));
}
-void IFWL_Form::Finalize() {
- delete m_pDelegate;
- m_pDelegate = nullptr;
+IFWL_Form::~IFWL_Form() {
UnregisterEventTarget();
UnRegisterForm();
- IFWL_Widget::Finalize();
+ RemoveSysButtons();
}
FWL_Type IFWL_Form::GetClassID() const {
« no previous file with comments | « xfa/fwl/core/ifwl_form.h ('k') | xfa/fwl/core/ifwl_formproxy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698