Remove xfa/src/fwl/src and move code up a level.

xfa/src/fwl/basewidget/fwl_comboboximp.cpp

Index: xfa/src/fwl/basewidget/fwl_comboboximp.cpp
diff --git a/xfa/src/fwl/src/basewidget/fwl_comboboximp.cpp b/xfa/src/fwl/basewidget/fwl_comboboximp.cpp
similarity index 98%
rename from xfa/src/fwl/src/basewidget/fwl_comboboximp.cpp
rename to xfa/src/fwl/basewidget/fwl_comboboximp.cpp
index d9f6220a1c54f36ae67533ffb2545e9ace23ef83..842ab8aaa9d4f451f35cc68a61503ca6b6f305f6 100644
--- a/xfa/src/fwl/src/basewidget/fwl_comboboximp.cpp
+++ b/xfa/src/fwl/basewidget/fwl_comboboximp.cpp
@@ -4,22 +4,22 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fwl/src/basewidget/fwl_comboboximp.h"
+#include "xfa/src/fwl/basewidget/fwl_comboboximp.h"
 
 #include "xfa/include/fwl/core/fwl_theme.h"
 #include "xfa/src/fdp/include/fde_tto.h"
-#include "xfa/src/fwl/src/basewidget/fwl_editimp.h"
-#include "xfa/src/fwl/src/basewidget/fwl_formproxyimp.h"
-#include "xfa/src/fwl/src/basewidget/fwl_listboximp.h"
-#include "xfa/src/fwl/src/basewidget/fwl_scrollbarimp.h"
-#include "xfa/src/fwl/src/core/fwl_appimp.h"
-#include "xfa/src/fwl/src/core/fwl_formimp.h"
-#include "xfa/src/fwl/src/core/fwl_noteimp.h"
-#include "xfa/src/fwl/src/core/fwl_panelimp.h"
-#include "xfa/src/fwl/src/core/fwl_targetimp.h"
-#include "xfa/src/fwl/src/core/fwl_threadimp.h"
-#include "xfa/src/fwl/src/core/fwl_widgetimp.h"
-#include "xfa/src/fwl/src/core/fwl_widgetmgrimp.h"
+#include "xfa/src/fwl/basewidget/fwl_editimp.h"
+#include "xfa/src/fwl/basewidget/fwl_formproxyimp.h"
+#include "xfa/src/fwl/basewidget/fwl_listboximp.h"
+#include "xfa/src/fwl/basewidget/fwl_scrollbarimp.h"
+#include "xfa/src/fwl/core/fwl_appimp.h"
+#include "xfa/src/fwl/core/fwl_formimp.h"
+#include "xfa/src/fwl/core/fwl_noteimp.h"
+#include "xfa/src/fwl/core/fwl_panelimp.h"
+#include "xfa/src/fwl/core/fwl_targetimp.h"
+#include "xfa/src/fwl/core/fwl_threadimp.h"
+#include "xfa/src/fwl/core/fwl_widgetimp.h"
+#include "xfa/src/fwl/core/fwl_widgetmgrimp.h"
 
 // static
 IFWL_ComboBox* IFWL_ComboBox::Create(
@@ -136,8 +136,7 @@ CFWL_ComboEditImp::CFWL_ComboEditImp(const CFWL_WidgetImpProperties& properties,
 }
 
 CFWL_ComboEditImpDelegate::CFWL_ComboEditImpDelegate(CFWL_ComboEditImp* pOwner)
-    : CFWL_EditImpDelegate(pOwner), m_pOwner(pOwner) {
-}
+    : CFWL_EditImpDelegate(pOwner), m_pOwner(pOwner) {}
 int32_t CFWL_ComboEditImpDelegate::OnProcessMessage(CFWL_Message* pMessage) {
   if (!pMessage)
     return 0;
@@ -279,8 +278,7 @@ void CFWL_ComboListImp::SetFocus(FX_BOOL bSet) {
   CFWL_WidgetImp::SetFocus(bSet);
 }
 CFWL_ComboListImpDelegate::CFWL_ComboListImpDelegate(CFWL_ComboListImp* pOwner)
-    : CFWL_ListBoxImpDelegate(pOwner), m_pOwner(pOwner) {
-}
+    : CFWL_ListBoxImpDelegate(pOwner), m_pOwner(pOwner) {}
 int32_t CFWL_ComboListImpDelegate::OnProcessMessage(CFWL_Message* pMessage) {
   if (!pMessage)
     return 0;
@@ -477,8 +475,7 @@ CFWL_ComboBoxImp::CFWL_ComboBoxImp(const CFWL_WidgetImpProperties& properties,
   m_rtBtn.Reset();
   m_rtHandler.Reset();
 }
-CFWL_ComboBoxImp::~CFWL_ComboBoxImp() {
-}
+CFWL_ComboBoxImp::~CFWL_ComboBoxImp() {}
 FWL_ERR CFWL_ComboBoxImp::GetClassName(CFX_WideString& wsClass) const {
   wsClass = FWL_CLASS_ComboBox;
   return FWL_ERR_Succeeded;
@@ -1533,8 +1530,9 @@ void CFWL_ComboBoxImpDelegate::DoSubCtrlKey(CFWL_MsgKey* pMsg) {
   const bool bUp = dwKeyCode == FWL_VKEY_Up;
   const bool bDown = dwKeyCode == FWL_VKEY_Down;
   if (bUp || bDown) {
-    int32_t iCount = static_cast<CFWL_ComboListImp*>(
-                         m_pOwner->m_pListBox->GetImpl())->CountItems();
+    int32_t iCount =
+        static_cast<CFWL_ComboListImp*>(m_pOwner->m_pListBox->GetImpl())
+            ->CountItems();
     if (iCount < 1) {
       return;
     }
@@ -1731,8 +1729,7 @@ CFWL_ComboProxyImpDelegate::CFWL_ComboProxyImpDelegate(
       m_bLButtonUpSelf(FALSE),
       m_fStartPos(0),
       m_pForm(pForm),
-      m_pComboBox(pComboBox) {
-}
+      m_pComboBox(pComboBox) {}
 int32_t CFWL_ComboProxyImpDelegate::OnProcessMessage(CFWL_Message* pMessage) {
   if (!pMessage)
     return 0;
@@ -1808,8 +1805,7 @@ void CFWL_ComboProxyImpDelegate::OnLButtonUp(CFWL_MsgMouse* pMsg) {
     m_bLButtonUpSelf = TRUE;
   }
 }
-void CFWL_ComboProxyImpDelegate::OnMouseMove(CFWL_MsgMouse* pMsg) {
-}
+void CFWL_ComboProxyImpDelegate::OnMouseMove(CFWL_MsgMouse* pMsg) {}
 void CFWL_ComboProxyImpDelegate::OnDeactive(CFWL_MsgDeactivate* pMsg) {
   m_pComboBox->ShowDropList(FALSE);
 }