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

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

Issue 2469893004: Unify CFWL_WidgetProperties and CFWL_WidgetImpProperties. (Closed)
Patch Set: cleanup 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
Index: xfa/fwl/core/ifwl_picturebox.h
diff --git a/xfa/fwl/core/ifwl_picturebox.h b/xfa/fwl/core/ifwl_picturebox.h
index edd8e7efa52b2d8713b3f7801dc0cdfa74880660..3b18166fe60a2568c1139791694549cd938fa5b9 100644
--- a/xfa/fwl/core/ifwl_picturebox.h
+++ b/xfa/fwl/core/ifwl_picturebox.h
@@ -7,7 +7,7 @@
#ifndef XFA_FWL_CORE_IFWL_PICTUREBOX_H_
#define XFA_FWL_CORE_IFWL_PICTUREBOX_H_
-#include "xfa/fwl/core/cfwl_widgetimpproperties.h"
+#include "xfa/fwl/core/cfwl_widgetproperties.h"
#include "xfa/fwl/core/fwl_error.h"
#include "xfa/fwl/core/ifwl_dataprovider.h"
#include "xfa/fwl/core/ifwl_widget.h"
@@ -27,7 +27,7 @@
#define FWL_STYLEEXT_PTB_VAlignMask 3L << 2
#define FWL_STYLEEXT_PTB_StretchAlignMask 7L << 4
-class CFWL_WidgetImpProperties;
+class CFWL_WidgetProperties;
Tom Sepez 2016/11/03 18:22:44 ditto
dsinclair 2016/11/03 19:10:18 Done.
class CFX_DIBitmap;
class IFWL_Widget;
@@ -44,7 +44,7 @@ class IFWL_PictureBoxDP : public IFWL_DataProvider {
class IFWL_PictureBox : public IFWL_Widget {
public:
explicit IFWL_PictureBox(const IFWL_App* app,
- const CFWL_WidgetImpProperties& properties);
+ std::unique_ptr<CFWL_WidgetProperties> properties);
~IFWL_PictureBox() override;
// IFWL_Widget

Powered by Google App Engine
This is Rietveld 408576698