Merge the CFWL_*Imp classes into the IFWL_* classes.

xfa/fwl/lightwidget/cfwl_combobox.h

 // 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
 
 #ifndef XFA_FWL_LIGHTWIDGET_CFWL_COMBOBOX_H_
 #define XFA_FWL_LIGHTWIDGET_CFWL_COMBOBOX_H_
 
 #include <memory>
 #include <vector>
 
-#include "xfa/fwl/basewidget/ifwl_combobox.h"
+#include "xfa/fwl/core/ifwl_combobox.h"
 #include "xfa/fwl/lightwidget/cfwl_widget.h"
 
 class CFWL_WidgetProperties;
 class IFWL_ComboBoxDP;
 class CFWL_ComboBoxDP;
 class CFWL_ComboBoxItem;
 
 class CFWL_ComboBox : public CFWL_Widget {
  public:
   CFWL_ComboBox();
@@ skipping 51 matching lines @@
   class CFWL_ComboBoxDP : public IFWL_ComboBoxDP {
    public:
     CFWL_ComboBoxDP();
     ~CFWL_ComboBoxDP() override;
 
     // IFWL_DataProvider
     FWL_Error GetCaption(IFWL_Widget* pWidget,
                          CFX_WideString& wsCaption) override;
 
     // IFWL_ListBoxDP
-    int32_t CountItems(IFWL_Widget* pWidget) override;
-    IFWL_ListItem* GetItem(IFWL_Widget* pWidget, int32_t nIndex) override;
+    int32_t CountItems(const IFWL_Widget* pWidget) override;
+    IFWL_ListItem* GetItem(const IFWL_Widget* pWidget, int32_t nIndex) override;
     int32_t GetItemIndex(IFWL_Widget* pWidget, IFWL_ListItem* pItem) override;
     FX_BOOL SetItemIndex(IFWL_Widget* pWidget,
                          IFWL_ListItem* pItem,
                          int32_t nIndex) override;
 
     uint32_t GetItemStyles(IFWL_Widget* pWidget, IFWL_ListItem* pItem) override;
     FWL_Error GetItemText(IFWL_Widget* pWidget,
                           IFWL_ListItem* pItem,
                           CFX_WideString& wsText) override;
     FWL_Error GetItemRect(IFWL_Widget* pWidget,
@@ skipping 42 matching lines @@
   CFX_RectF m_rtItem;
   uint32_t m_dwStyles;
   CFX_WideString m_wsText;
   CFX_DIBitmap* m_pDIB;
   uint32_t m_dwCheckState;
   CFX_RectF m_rtCheckBox;
   void* m_pData;
 };
 
 #endif  // XFA_FWL_LIGHTWIDGET_CFWL_COMBOBOX_H_