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

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

Issue 2436103002: Remove FWL globals. (Closed)
Patch Set: fix mac Created 4 years, 2 months 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/cfwl_barcode.cpp
diff --git a/xfa/fwl/core/cfwl_barcode.cpp b/xfa/fwl/core/cfwl_barcode.cpp
index 67cbc301bd5a1afbf15597f5863ecd7ee810336a..aa32558969518cd5ff2233af7ccf17163c14cef9 100644
--- a/xfa/fwl/core/cfwl_barcode.cpp
+++ b/xfa/fwl/core/cfwl_barcode.cpp
@@ -8,34 +8,31 @@
#include <memory>
-IFWL_Barcode* CFWL_Barcode::GetWidget() {
- return static_cast<IFWL_Barcode*>(m_pIface.get());
-}
+CFWL_Barcode::CFWL_Barcode(const IFWL_App* app) : CFWL_Edit(app) {}
-const IFWL_Barcode* CFWL_Barcode::GetWidget() const {
- return static_cast<IFWL_Barcode*>(m_pIface.get());
-}
+CFWL_Barcode::~CFWL_Barcode() {}
-FWL_Error CFWL_Barcode::Initialize(const CFWL_WidgetProperties* pProperties) {
- if (m_pIface)
- return FWL_Error::Indefinite;
- if (pProperties) {
+void CFWL_Barcode::Initialize(const CFWL_WidgetProperties* pProperties) {
+ ASSERT(!m_pIface);
+
+ if (pProperties)
*m_pProperties = *pProperties;
- }
- std::unique_ptr<IFWL_Barcode> pBarcode(
- new IFWL_Barcode(m_pProperties->MakeWidgetImpProperties(&m_barcodeData)));
- FWL_Error ret = pBarcode->Initialize();
- if (ret != FWL_Error::Succeeded) {
- return ret;
- }
+
+ std::unique_ptr<IFWL_Barcode> pBarcode(new IFWL_Barcode(
+ m_pApp, m_pProperties->MakeWidgetImpProperties(&m_barcodeData)));
+ pBarcode->Initialize();
+
m_pIface = std::move(pBarcode);
- CFWL_Widget::Initialize();
- return FWL_Error::Succeeded;
+ CFWL_Widget::Initialize(pProperties);
}
-CFWL_Barcode::CFWL_Barcode() {}
+IFWL_Barcode* CFWL_Barcode::GetWidget() {
+ return static_cast<IFWL_Barcode*>(m_pIface.get());
+}
-CFWL_Barcode::~CFWL_Barcode() {}
+const IFWL_Barcode* CFWL_Barcode::GetWidget() const {
+ return static_cast<IFWL_Barcode*>(m_pIface.get());
+}
void CFWL_Barcode::SetType(BC_TYPE type) {
if (GetWidget())

Powered by Google App Engine
This is Rietveld 408576698