Move cef_* header files that should not be directly included by the client to the "include/internal" folder.

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@237 5089003a-bbd8-11dd-ad1f-f1f9622dbc98

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',

include/cef.h

@@ -41,17 +41,17 @@
 #include <map>
 #include <string>
 #include <vector>
-#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;

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

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

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

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 -----------------------------------------------------

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.

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);

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"
 

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"

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"

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 <map>
 #include <vector>
 

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"
 
 """