More FWL interface cleanup.

xfa/fwl/core/fwl_appimp.h

Index: xfa/fwl/core/fwl_appimp.h
diff --git a/xfa/fwl/core/fwl_appimp.h b/xfa/fwl/core/fwl_appimp.h
index a7130602fd00306ee74399c3f4623d9f8f3bd7c4..8743b54a43ea3f2dd3f50bd8c85b7266ed885809 100644
--- a/xfa/fwl/core/fwl_appimp.h
+++ b/xfa/fwl/core/fwl_appimp.h
@@ -9,18 +9,23 @@
 
 #include <memory>
 
-#include "xfa/fwl/core/fwl_threadimp.h"
+#include "xfa/fwl/core/fwl_noteimp.h"
 
 class CFWL_WidgetMgr;
 class IFWL_AdapterNative;
-class IFWL_WidgetMgr;
-class IFWL_ThemeProvider;
 class IFWL_App;
+class IFWL_NoteThread;
+class IFWL_ThemeProvider;
+class IFWL_WidgetMgr;
 
-class CFWL_AppImp : public CFWL_ThreadImp {
+class CFWL_AppImp {
  public:
   CFWL_AppImp(IFWL_App* pIface, IFWL_AdapterNative* pAdapter);
   virtual ~CFWL_AppImp();
+
+  IFWL_App* GetInterface() const { return m_pIface; }
+  CFWL_NoteDriver* GetNoteDriver() const { return m_pNoteDriver.get(); }
+
   virtual FWL_ERR Initialize();
   virtual FWL_ERR Finalize();
   virtual IFWL_AdapterNative* GetAdapterNative() const;
@@ -33,6 +38,10 @@ class CFWL_AppImp : public CFWL_ThreadImp {
   IFWL_AdapterNative* const m_pAdapterNative;
   std::unique_ptr<CFWL_WidgetMgr> m_pWidgetMgr;
   IFWL_ThemeProvider* m_pThemeProvider;
+  std::unique_ptr<CFWL_NoteDriver> m_pNoteDriver;
+
+ private:
+  IFWL_App* const m_pIface;
 };
 
 #endif  // XFA_FWL_CORE_FWL_APPIMP_H_