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

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

Issue 2436103002: Remove FWL globals. (Closed)
Patch Set: Review feedback 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_app.h ('k') | xfa/fwl/core/ifwl_barcode.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: xfa/fwl/core/ifwl_app.cpp
diff --git a/xfa/fwl/core/ifwl_app.cpp b/xfa/fwl/core/ifwl_app.cpp
index a47a76e4c0b9e860cc67d70a8ca1e49c667dfc40..2612088c79cd8978f394f0eccc425e90af7d6412 100644
--- a/xfa/fwl/core/ifwl_app.cpp
+++ b/xfa/fwl/core/ifwl_app.cpp
@@ -12,39 +12,13 @@
#include "xfa/fwl/core/ifwl_widget.h"
#include "xfa/fxfa/app/xfa_fwladapter.h"
-CXFA_FWLAdapterWidgetMgr* FWL_GetAdapterWidgetMgr() {
- return CFWL_WidgetMgr::GetInstance()->GetAdapterWidgetMgr();
-}
-
-CXFA_FFApp* FWL_GetAdapterNative() {
- IFWL_App* pApp = FWL_GetApp();
- if (!pApp)
- return nullptr;
- return pApp->GetAdapterNative();
-}
-
-static IFWL_App* g_theApp = nullptr;
-IFWL_App* FWL_GetApp() {
- return g_theApp;
-}
-
-void FWL_SetApp(IFWL_App* pApp) {
- g_theApp = pApp;
-}
-
IFWL_App::IFWL_App(CXFA_FFApp* pAdapter)
: m_pAdapterNative(pAdapter),
m_pWidgetMgr(pdfium::MakeUnique<CFWL_WidgetMgr>(pAdapter)),
- m_pNoteDriver(pdfium::MakeUnique<CFWL_NoteDriver>()) {}
+ m_pNoteDriver(pdfium::MakeUnique<CFWL_NoteDriver>()) {
+ ASSERT(m_pAdapterNative);
+}
IFWL_App::~IFWL_App() {
CFWL_ToolTipContainer::DeleteInstance();
}
-
-CXFA_FFApp* IFWL_App::GetAdapterNative() {
- return m_pAdapterNative;
-}
-
-CFWL_WidgetMgr* IFWL_App::GetWidgetMgr() {
- return m_pWidgetMgr.get();
-}
« no previous file with comments | « xfa/fwl/core/ifwl_app.h ('k') | xfa/fwl/core/ifwl_barcode.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698