diff --git a/cef.gyp b/cef.gyp index 35ce582a8..66b20b7cd 100644 --- a/cef.gyp +++ b/cef.gyp @@ -28,7 +28,6 @@ 'include/cef.h', 'include/cef_nplugin.h', 'include/cef_runnable.h', - 'include/cef_tuple.h', 'include/cef_wrapper.h', 'tests/cefclient/binding_test.cpp', 'tests/cefclient/binding_test.h', @@ -316,20 +315,9 @@ ], 'sources': [ 'include/cef.h', - 'include/cef_build.h', 'include/cef_capi.h', - 'include/cef_export.h', 'include/cef_nplugin.h', 'include/cef_nplugin_capi.h', - 'include/cef_nplugin_types.h', - 'include/cef_ptr.h', - 'include/cef_string.h', - 'include/cef_string_list.h', - 'include/cef_string_map.h', - 'include/cef_string_types.h', - 'include/cef_string_wrappers.h', - 'include/cef_types.h', - 'include/cef_types_wrappers.h', 'libcef_dll/cef_logging.h', 'libcef_dll/cpptoc/browser_cpptoc.cc', 'libcef_dll/cpptoc/browser_cpptoc.h', @@ -463,6 +451,10 @@ '..', ], 'sources': [ + 'include/cef.h', + 'include/cef_capi.h', + 'include/cef_nplugin.h', + 'include/cef_nplugin_capi.h', 'include/cef_wrapper.h', 'libcef_dll/cef_logging.h', 'libcef_dll/cpptoc/client_cpptoc.cc', @@ -608,17 +600,17 @@ ], 'sources': [ 'include/cef.h', - 'include/cef_build.h', - 'include/cef_export.h', 'include/cef_nplugin.h', - 'include/cef_ptr.h', - 'include/cef_string.h', - 'include/cef_string_list.h', - 'include/cef_string_map.h', - 'include/cef_string_types.h', - 'include/cef_string_wrappers.h', - 'include/cef_types.h', - 'include/cef_types_wrappers.h', + 'include/internal/cef_build.h', + 'include/internal/cef_export.h', + 'include/internal/cef_ptr.h', + 'include/internal/cef_string.h', + 'include/internal/cef_string_list.h', + 'include/internal/cef_string_map.h', + 'include/internal/cef_string_types.h', + 'include/internal/cef_string_wrappers.h', + 'include/internal/cef_types.h', + 'include/internal/cef_types_wrappers.h', 'libcef/browser_appcache_system.cc', 'libcef/browser_appcache_system.h', 'libcef/browser_database_system.cc', diff --git a/include/cef.h b/include/cef.h index 2b9bbe2d2..8eceee7b8 100644 --- a/include/cef.h +++ b/include/cef.h @@ -41,17 +41,17 @@ #include #include #include -#include "cef_build.h" -#include "cef_ptr.h" -#include "cef_types_wrappers.h" +#include "internal/cef_build.h" +#include "internal/cef_ptr.h" +#include "internal/cef_types_wrappers.h" // Bring in platform-specific definitions. #if defined(OS_WIN) -#include "cef_win.h" +#include "internal/cef_win.h" #elif defined(OS_MACOSX) -#include "cef_mac.h" +#include "internal/cef_mac.h" #elif defined(OS_LINUX) -#include "cef_linux.h" +#include "internal/cef_linux.h" #endif class CefBrowser; diff --git a/include/cef_capi.h b/include/cef_capi.h index e191289e5..ab4f5eb2f 100644 --- a/include/cef_capi.h +++ b/include/cef_capi.h @@ -41,11 +41,11 @@ extern "C" { #endif -#include "cef_export.h" -#include "cef_string.h" -#include "cef_string_list.h" -#include "cef_string_map.h" -#include "cef_types.h" +#include "internal/cef_export.h" +#include "internal/cef_string.h" +#include "internal/cef_string_list.h" +#include "internal/cef_string_map.h" +#include "internal/cef_types.h" // This function should be called on the main application thread to initialize diff --git a/include/cef_nplugin.h b/include/cef_nplugin.h index b19152707..87381172b 100644 --- a/include/cef_nplugin.h +++ b/include/cef_nplugin.h @@ -31,7 +31,7 @@ #ifndef _CEF_NPLUGIN_H #define _CEF_NPLUGIN_H -#include "cef_nplugin_types.h" +#include "internal/cef_nplugin_types.h" // Netscape plugins are normally built at separate DLLs that are loaded by the // browser when needed. This interface supports the creation of plugins that diff --git a/include/cef_nplugin_capi.h b/include/cef_nplugin_capi.h index 2f7e4f70a..ebdd04a6e 100644 --- a/include/cef_nplugin_capi.h +++ b/include/cef_nplugin_capi.h @@ -31,17 +31,15 @@ #ifndef _CEF_NPLUGIN_CAPI_H #define _CEF_NPLUGIN_CAPI_H -#include "cef_nplugin_types.h" - #ifdef __cplusplus extern "C" { #endif +#include "internal/cef_nplugin_types.h" // Register a plugin with the system. Returns true (1) on success. CEF_EXPORT int cef_register_plugin(const cef_plugin_info_t* plugin_info); - #ifdef __cplusplus } #endif diff --git a/include/cef_runnable.h b/include/cef_runnable.h index b0dcddc5e..a311f2cc1 100644 --- a/include/cef_runnable.h +++ b/include/cef_runnable.h @@ -38,7 +38,7 @@ #ifdef BUILDING_CEF_SHARED #include "base/tuple.h" #else -#include "cef_tuple.h" +#include "internal/cef_tuple.h" #endif // CefRunnableMethodTraits ----------------------------------------------------- diff --git a/include/cef_build.h b/include/internal/cef_build.h similarity index 100% rename from include/cef_build.h rename to include/internal/cef_build.h diff --git a/include/cef_export.h b/include/internal/cef_export.h similarity index 100% rename from include/cef_export.h rename to include/internal/cef_export.h diff --git a/include/cef_linux.h b/include/internal/cef_linux.h similarity index 100% rename from include/cef_linux.h rename to include/internal/cef_linux.h diff --git a/include/cef_mac.h b/include/internal/cef_mac.h similarity index 100% rename from include/cef_mac.h rename to include/internal/cef_mac.h diff --git a/include/cef_nplugin_types.h b/include/internal/cef_nplugin_types.h similarity index 100% rename from include/cef_nplugin_types.h rename to include/internal/cef_nplugin_types.h diff --git a/include/cef_ptr.h b/include/internal/cef_ptr.h similarity index 100% rename from include/cef_ptr.h rename to include/internal/cef_ptr.h diff --git a/include/cef_string.h b/include/internal/cef_string.h similarity index 100% rename from include/cef_string.h rename to include/internal/cef_string.h diff --git a/include/cef_string_list.h b/include/internal/cef_string_list.h similarity index 100% rename from include/cef_string_list.h rename to include/internal/cef_string_list.h diff --git a/include/cef_string_map.h b/include/internal/cef_string_map.h similarity index 100% rename from include/cef_string_map.h rename to include/internal/cef_string_map.h diff --git a/include/cef_string_types.h b/include/internal/cef_string_types.h similarity index 100% rename from include/cef_string_types.h rename to include/internal/cef_string_types.h diff --git a/include/cef_string_wrappers.h b/include/internal/cef_string_wrappers.h similarity index 100% rename from include/cef_string_wrappers.h rename to include/internal/cef_string_wrappers.h diff --git a/include/cef_tuple.h b/include/internal/cef_tuple.h similarity index 100% rename from include/cef_tuple.h rename to include/internal/cef_tuple.h diff --git a/include/cef_types.h b/include/internal/cef_types.h similarity index 100% rename from include/cef_types.h rename to include/internal/cef_types.h diff --git a/include/cef_types_linux.h b/include/internal/cef_types_linux.h similarity index 100% rename from include/cef_types_linux.h rename to include/internal/cef_types_linux.h diff --git a/include/cef_types_mac.h b/include/internal/cef_types_mac.h similarity index 100% rename from include/cef_types_mac.h rename to include/internal/cef_types_mac.h diff --git a/include/cef_types_win.h b/include/internal/cef_types_win.h similarity index 100% rename from include/cef_types_win.h rename to include/internal/cef_types_win.h diff --git a/include/cef_types_wrappers.h b/include/internal/cef_types_wrappers.h similarity index 99% rename from include/cef_types_wrappers.h rename to include/internal/cef_types_wrappers.h index b25da46f5..9252c873f 100644 --- a/include/cef_types_wrappers.h +++ b/include/internal/cef_types_wrappers.h @@ -30,6 +30,8 @@ #ifndef _CEF_TYPES_WRAPPERS_H #define _CEF_TYPES_WRAPPERS_H +#include "cef_string.h" +#include "cef_string_list.h" #include "cef_types.h" // Template class that provides common functionality for CEF structure wrapping. diff --git a/include/cef_win.h b/include/internal/cef_win.h similarity index 100% rename from include/cef_win.h rename to include/internal/cef_win.h diff --git a/libcef/browser_settings.h b/libcef/browser_settings.h index 47001e1a8..dc762a093 100644 --- a/libcef/browser_settings.h +++ b/libcef/browser_settings.h @@ -5,7 +5,7 @@ #ifndef _CEF_BROWSER_SETTINGS_H #define _CEF_BROWSER_SETTINGS_H -#include "include/cef_types_wrappers.h" +#include "include/internal/cef_types_wrappers.h" struct WebPreferences; void BrowserToWebSettings(const CefBrowserSettings& cef, WebPreferences& web); diff --git a/libcef/browser_zoom_map.h b/libcef/browser_zoom_map.h index 75c75ab6e..b36d4c387 100644 --- a/libcef/browser_zoom_map.h +++ b/libcef/browser_zoom_map.h @@ -5,7 +5,7 @@ #ifndef _BROWSER_ZOOM_MAP_H #define _BROWSER_ZOOM_MAP_H -#include "include/cef_string.h" +#include "include/internal/cef_string.h" #include "base/memory/singleton.h" #include "googleurl/src/gurl.h" diff --git a/libcef/printing/print_settings.h b/libcef/printing/print_settings.h index 8c073b5e9..c9029b885 100644 --- a/libcef/printing/print_settings.h +++ b/libcef/printing/print_settings.h @@ -5,7 +5,7 @@ #ifndef _PRINTING_PRINT_SETTINGS_H #define _PRINTING_PRINT_SETTINGS_H -#include "include/cef_types.h" +#include "include/internal/cef_types.h" #include "printing/page_range.h" #include "printing/page_setup.h" diff --git a/libcef/webwidget_host.h b/libcef/webwidget_host.h index ec6e2002f..d07d6141b 100644 --- a/libcef/webwidget_host.h +++ b/libcef/webwidget_host.h @@ -5,8 +5,8 @@ #ifndef _WEBWIDGET_HOST_H #define _WEBWIDGET_HOST_H -#include "include/cef_string.h" -#include "include/cef_types.h" +#include "include/internal/cef_string.h" +#include "include/internal/cef_types.h" #include "base/basictypes.h" #include "base/scoped_ptr.h" #include "base/task.h" diff --git a/libcef_dll/transfer_util.h b/libcef_dll/transfer_util.h index c5be6d64e..577bdd532 100644 --- a/libcef_dll/transfer_util.h +++ b/libcef_dll/transfer_util.h @@ -5,8 +5,8 @@ #ifndef _TRANSFER_UTIL_H #define _TRANSFER_UTIL_H -#include "include/cef_string_list.h" -#include "include/cef_string_map.h" +#include "include/internal/cef_string_list.h" +#include "include/internal/cef_string_map.h" #include #include diff --git a/tools/make_capi_header.py b/tools/make_capi_header.py index 0f066cb3c..2f8c14c4c 100644 --- a/tools/make_capi_header.py +++ b/tools/make_capi_header.py @@ -88,11 +88,11 @@ def make_capi_header(header): extern "C" { #endif -#include "cef_export.h" -#include "cef_string.h" -#include "cef_string_list.h" -#include "cef_string_map.h" -#include "cef_types.h" +#include "internal/cef_export.h" +#include "internal/cef_string.h" +#include "internal/cef_string_list.h" +#include "internal/cef_string_map.h" +#include "internal/cef_types.h" """