Move xfa/include/fwl/{core,basewidget} to xfa/fwl/{core,basewidget}.

xfa/fwl/theme/comboboxtp.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "xfa/include/fwl/theme/comboboxtp.h"
 
+#include "xfa/fwl/basewidget/ifwl_combobox.h"
+#include "xfa/fwl/core/cfwl_themebackground.h"
+#include "xfa/fwl/core/ifwl_themeprovider.h"
+#include "xfa/fwl/core/ifwl_widget.h"
 #include "xfa/fxgraphics/cfx_color.h"
 #include "xfa/fxgraphics/cfx_path.h"
-#include "xfa/include/fwl/basewidget/fwl_combobox.h"
-#include "xfa/include/fwl/core/fwl_widget.h"
 
 #define FWLTHEME_CAPACITY_ComboFormHandler 8.0f
 
 CFWL_ComboBoxTP::CFWL_ComboBoxTP() {
   m_dwThemeID = 0;
 }
 CFWL_ComboBoxTP::~CFWL_ComboBoxTP() {}
 FX_BOOL CFWL_ComboBoxTP::IsValidWidget(IFWL_Widget* pWidget) {
   if (!pWidget)
     return FALSE;
@@ skipping 126 matching lines @@
     }
     case FWL_CMBPARTSTATE_Disabled: {
       argbFill = 0xFFF0F0F0;
       break;
     }
   }
   DrawArrow(pParams->m_pGraphics, &pParams->m_rtPart, FWLTHEME_DIRECTION_Down,
             argbFill, bPressed, &pParams->m_matrix);
 }
 #endif