From 7322343b9322b93d97077575f95a00dcca3f0451 Mon Sep 17 00:00:00 2001
From: dsinclair <dsinclair@chromium.org>
Date: Thu, 28 Apr 2016 10:51:13 -0700
Subject: More FWL interface cleanup.

This CL merges the IFWL_Target class into IFWL_Widget and IFWL_Thread into
IFWL_App. The IFWL_WidgetMgrDelegate, IFWL_NoteDriver and IFWL_NotThread are
removed in favour of their concrete classes.

Review-Url: https://codereview.chromium.org/1921853006
---
 xfa/fwl/core/fwl_appimp.cpp | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

(limited to 'xfa/fwl/core/fwl_appimp.cpp')

diff --git a/xfa/fwl/core/fwl_appimp.cpp b/xfa/fwl/core/fwl_appimp.cpp
index 95ed0c90cc..0017aad8ad 100644
--- a/xfa/fwl/core/fwl_appimp.cpp
+++ b/xfa/fwl/core/fwl_appimp.cpp
@@ -7,8 +7,6 @@
 #include "xfa/fwl/core/fwl_appimp.h"
 
 #include "xfa/fwl/core/fwl_noteimp.h"
-#include "xfa/fwl/core/fwl_targetimp.h"
-#include "xfa/fwl/core/fwl_threadimp.h"
 #include "xfa/fwl/core/fwl_widgetmgrimp.h"
 #include "xfa/fwl/core/ifwl_adapterwidgetmgr.h"
 #include "xfa/fwl/core/ifwl_app.h"
@@ -19,32 +17,46 @@ IFWL_App* IFWL_App::Create(IFWL_AdapterNative* pAdapter) {
   pApp->SetImpl(new CFWL_AppImp(pApp, pAdapter));
   return pApp;
 }
+
+void IFWL_App::Release() {}
+
 FWL_ERR IFWL_App::Initialize() {
   return static_cast<CFWL_AppImp*>(GetImpl())->Initialize();
 }
+
 FWL_ERR IFWL_App::Finalize() {
   return static_cast<CFWL_AppImp*>(GetImpl())->Finalize();
 }
+
 IFWL_AdapterNative* IFWL_App::GetAdapterNative() {
   return static_cast<CFWL_AppImp*>(GetImpl())->GetAdapterNative();
 }
+
 IFWL_WidgetMgr* IFWL_App::GetWidgetMgr() {
   return static_cast<CFWL_AppImp*>(GetImpl())->GetWidgetMgr();
 }
+
 IFWL_ThemeProvider* IFWL_App::GetThemeProvider() {
   return static_cast<CFWL_AppImp*>(GetImpl())->GetThemeProvider();
 }
+
 FWL_ERR IFWL_App::SetThemeProvider(IFWL_ThemeProvider* pThemeProvider) {
   return static_cast<CFWL_AppImp*>(GetImpl())->SetThemeProvider(pThemeProvider);
 }
+
 FWL_ERR IFWL_App::Exit(int32_t iExitCode) {
   return static_cast<CFWL_AppImp*>(GetImpl())->Exit(iExitCode);
 }
 
+CFWL_NoteDriver* IFWL_App::GetNoteDriver() const {
+  return static_cast<CFWL_AppImp*>(GetImpl())->GetNoteDriver();
+}
+
 CFWL_AppImp::CFWL_AppImp(IFWL_App* pIface, IFWL_AdapterNative* pAdapter)
-    : CFWL_ThreadImp(pIface),
-      m_pAdapterNative(pAdapter),
-      m_pThemeProvider(nullptr) {}
+    : m_pAdapterNative(pAdapter),
+      m_pThemeProvider(nullptr),
+      m_pNoteDriver(new CFWL_NoteDriver),
+      m_pIface(pIface) {}
 
 CFWL_AppImp::~CFWL_AppImp() {
   CFWL_ToolTipContainer::DeleteInstance();
-- 
cgit v1.2.3