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

Unified Diff: xfa/fwl/core/ifwl_widget.h

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_tooltip.cpp ('k') | xfa/fwl/core/ifwl_widget.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: xfa/fwl/core/ifwl_widget.h
diff --git a/xfa/fwl/core/ifwl_widget.h b/xfa/fwl/core/ifwl_widget.h
index 2b385abc0e7e67a7bc97cf5be0c6302f0b565bfb..264ff67513396f4474c17609028a0ed2c2e80e05 100644
--- a/xfa/fwl/core/ifwl_widget.h
+++ b/xfa/fwl/core/ifwl_widget.h
@@ -66,8 +66,6 @@ class IFWL_Widget {
public:
virtual ~IFWL_Widget();
- virtual void Initialize();
- virtual void Finalize();
virtual FWL_Type GetClassID() const = 0;
virtual FX_BOOL IsInstance(const CFX_WideStringC& wsClass) const;
@@ -203,16 +201,23 @@ class IFWL_Widget {
FX_BOOL IsParent(IFWL_Widget* pParent);
+ void SetDelegate(std::unique_ptr<IFWL_WidgetDelegate> delegate) {
+ m_pDelegate = std::move(delegate);
+ }
+ IFWL_WidgetDelegate* GetDelegate() const { return m_pDelegate.get(); }
+
const IFWL_App* const m_pOwnerApp;
CFWL_WidgetMgr* const m_pWidgetMgr;
std::unique_ptr<CFWL_WidgetImpProperties> m_pProperties;
- IFWL_WidgetDelegate* m_pDelegate;
- IFWL_WidgetDelegate* m_pCurDelegate;
+ IFWL_WidgetDelegate* m_pCurDelegate; // Not owned.
IFWL_Widget* m_pOuter;
void* m_pLayoutItem;
CFWL_Widget* m_pAssociate;
int32_t m_iLock;
uint32_t m_nEventKey;
+
+ private:
+ std::unique_ptr<IFWL_WidgetDelegate> m_pDelegate;
};
class CFWL_WidgetImpDelegate : public IFWL_WidgetDelegate {
« no previous file with comments | « xfa/fwl/core/ifwl_tooltip.cpp ('k') | xfa/fwl/core/ifwl_widget.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698