Re-land "Rename CFWL_Thread classes to ThreadImp"

xfa/src/fwl/src/core/include/fwl_appimp.h

Index: xfa/src/fwl/src/core/include/fwl_appimp.h
diff --git a/xfa/src/fwl/src/core/include/fwl_appimp.h b/xfa/src/fwl/src/core/include/fwl_appimp.h
index ec23febb32d264e6a5ae4e376362d803107368c4..53f0d3fe422e34fdbbbe82d0f1d3f4d9f22f7959 100644
--- a/xfa/src/fwl/src/core/include/fwl_appimp.h
+++ b/xfa/src/fwl/src/core/include/fwl_appimp.h
@@ -4,26 +4,28 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FWL_APP_IMP_H
-#define _FWL_APP_IMP_H
-class CFWL_NoteThread;
+#ifndef FWL_APPIMP_H_
+#define FWL_APPIMP_H_
+
+#include "xfa/src/fwl/src/core/include/fwl_threadimp.h"
+
 class CFWL_WidgetMgr;
 class IFWL_AdapterNative;
 class IFWL_WidgetMgr;
 class IFWL_ThemeProvider;
 class IFWL_App;
-class CFWL_AppImp;
-class CFWL_AppImp : public CFWL_NoteThread {
+
+class CFWL_AppImp : public CFWL_NoteThreadImp {
  public:
-  CFWL_AppImp(IFWL_AdapterNative* pAdapter);
+  CFWL_AppImp(IFWL_App* pIface, IFWL_AdapterNative* pAdapter);
   virtual ~CFWL_AppImp();
   virtual FWL_ERR Initialize();
   virtual FWL_ERR Finalize();
   virtual IFWL_AdapterNative* GetAdapterNative();
   virtual IFWL_WidgetMgr* GetWidgetMgr();
+  virtual IFWL_ThemeProvider* GetThemeProvider();
   virtual FWL_ERR SetThemeProvider(IFWL_ThemeProvider* pThemeProvider);
   virtual FWL_ERR Exit(int32_t iExitCode = 0);
-  IFWL_ThemeProvider* GetThemeProvider();
 
  protected:
   CFWL_WidgetMgr* m_pWidgetMgr;
@@ -31,4 +33,5 @@ class CFWL_AppImp : public CFWL_NoteThread {
   IFWL_ThemeProvider* m_pThemeProvider;
   FX_BOOL m_bFuelAdapter;
 };
-#endif
+
+#endif  // FWL_APPIMP_H_