Break cef.h into multiple headers (issue #142).

- Move wrapper classes from cef_wrapper.h to wrapper/ directory.
- Move C API functions/classes from cef_capi.h to capi/ directory.
- Move global function implementations from cef_context.cc to *_impl.cc files.
- Output auto-generated file paths in cef_paths.gypi.

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

tests/cefclient/binding_test.cpp

@@ -3,6 +3,9 @@
 // can be found in the LICENSE file.
 
 #include "binding_test.h"
+#include "include/cef_browser.h"
+#include "include/cef_frame.h"
+#include "include/cef_v8.h"
 #include <sstream>
 
 

tests/cefclient/binding_test.h

@@ -5,7 +5,11 @@
 #ifndef _CEFCLIENT_BINDING_TEST_H
 #define _CEFCLIENT_BINDING_TEST_H
 
-#include "include/cef.h"
+#include "include/cef_base.h"
+
+class CefBrowser;
+class CefFrame;
+class CefV8Value;
 
 // Add the V8 bindings.
 void InitBindingTest(CefRefPtr<CefBrowser> browser,

tests/cefclient/cefclient.cpp

@@ -2,10 +2,13 @@
 // reserved. Use of this source code is governed by a BSD-style license that
 // can be found in the LICENSE file.
 
-#include "include/cef.h"
-#include "include/cef_runnable.h"
-#include "include/cef_wrapper.h"
 #include "cefclient.h"
+#include "include/cef_app.h"
+#include "include/cef_browser.h"
+#include "include/cef_command_line.h"
+#include "include/cef_frame.h"
+#include "include/cef_runnable.h"
+#include "include/cef_web_urlrequest.h"
 #include "cefclient_switches.h"
 #include "client_handler.h"
 #include "binding_test.h"

tests/cefclient/cefclient.h

@@ -5,7 +5,11 @@
 #ifndef _CEFCLIENT_H
 #define _CEFCLIENT_H
 
-#include "include/cef.h"
+#include "include/cef_base.h"
+
+class CefApp;
+class CefBrowser;
+class CefCommandLine;
 
 // Returns the main browser window instance.
 CefRefPtr<CefBrowser> AppGetBrowser();

tests/cefclient/cefclient_gtk.cpp

@@ -1,11 +1,16 @@
-#include "include/cef.h"
-#include "cefclient.h"
-#include "client_handler.h"
+// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights
+// reserved. Use of this source code is governed by a BSD-style license that
+// can be found in the LICENSE file.
 
+#include "cefclient.h"
+#include "include/cef_app.h"
+#include "include/cef_browser.h"
+#include "include/cef_frame.h"
+#include "include/cef_runnable.h"
 #include "binding_test.h"
+#include "client_handler.h"
 #include "extension_test.h"
 #include "scheme_test.h"
-
 #include <gtk/gtk.h>
 #include <stdlib.h>
 #include <unistd.h>

tests/cefclient/cefclient_mac.mm

@@ -3,9 +3,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "include/cef.h"
-#import "include/cef_application_mac.h"
 #include "cefclient.h"
+#include "include/cef_app.h"
+#import "include/cef_application_mac.h"
+#include "include/cef_browser.h"
+#include "include/cef_frame.h"
+#include "include/cef_runnable.h"
 #include "binding_test.h"
 #include "client_handler.h"
 #include "extension_test.h"

tests/cefclient/cefclient_win.cpp

@@ -2,9 +2,11 @@
 // reserved. Use of this source code is governed by a BSD-style license that
 // can be found in the LICENSE file.
 
-#include "include/cef.h"
-#include "include/cef_runnable.h"
 #include "cefclient.h"
+#include "include/cef_app.h"
+#include "include/cef_browser.h"
+#include "include/cef_frame.h"
+#include "include/cef_runnable.h"
 #include "binding_test.h"
 #include "client_handler.h"
 #include "extension_test.h"

tests/cefclient/client_handler.cpp

@@ -2,8 +2,9 @@
 // reserved. Use of this source code is governed by a BSD-style license that
 // can be found in the LICENSE file.
 
-#include "include/cef.h"
 #include "client_handler.h"
+#include "include/cef_browser.h"
+#include "include/cef_frame.h"
 #include "binding_test.h"
 #include "cefclient.h"
 #include "download_handler.h"

tests/cefclient/client_handler.h

@@ -5,7 +5,7 @@
 #ifndef _CLIENT_HANDLER_H
 #define _CLIENT_HANDLER_H
 
-#include "include/cef.h"
+#include "include/cef_client.h"
 #include "download_handler.h"
 #include "util.h"
 

tests/cefclient/client_handler_gtk.cpp

@@ -1,7 +1,10 @@
-#include "include/cef.h"
-#include "include/cef_wrapper.h"
-#include "cefclient.h"
+// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights
+// reserved. Use of this source code is governed by a BSD-style license that
+// can be found in the LICENSE file.
+
 #include "client_handler.h"
+#include "include/cef_browser.h"
+#include "include/cef_frame.h"
 #include "resource_util.h"
 #include "string_util.h"
 #include <gtk/gtk.h>

tests/cefclient/client_handler_mac.mm

@@ -2,10 +2,9 @@
 // reserved. Use of this source code is governed by a BSD-style license that
 // can be found in the LICENSE file.
 
-#include "include/cef.h"
-#include "include/cef_wrapper.h"
-#include "cefclient.h"
 #include "client_handler.h"
+#include "include/cef_browser.h"
+#include "include/cef_frame.h"
 #include "resource_util.h"
 #include "string_util.h"
 #import <Cocoa/Cocoa.h>

tests/cefclient/client_handler_win.cpp

@@ -2,9 +2,9 @@
 // reserved. Use of this source code is governed by a BSD-style license that
 // can be found in the LICENSE file.
 
-#include "include/cef.h"
-#include "include/cef_wrapper.h"
 #include "client_handler.h"
+#include "include/cef_browser.h"
+#include "include/cef_frame.h"
 #include "resource.h"
 #include "resource_util.h"
 #include "string_util.h"

tests/cefclient/client_popup_handler.cpp

@@ -2,8 +2,8 @@
 // reserved. Use of this source code is governed by a BSD-style license that
 // can be found in the LICENSE file.
 
-#include "include/cef.h"
 #include "client_popup_handler.h"
+#include "include/cef_frame.h"
 #include "util.h"
 
 ClientPopupHandler::ClientPopupHandler(CefRefPtr<CefBrowser> parentBrowser)

tests/cefclient/client_popup_handler.h

@@ -5,7 +5,9 @@
 #ifndef _CLIENT_POPUP_HANDLER_H
 #define _CLIENT_POPUP_HANDLER_H
 
-#include "include/cef.h"
+#include "include/cef_browser.h"
+#include "include/cef_client.h"
+#include "include/cef_request_handler.h"
 
 // Handler for popup windows that loads the request in an existing browser
 // window.

tests/cefclient/download_handler.cpp

@@ -2,8 +2,9 @@
 // reserved. Use of this source code is governed by a BSD-style license that
 // can be found in the LICENSE file.
 
-#include "include/cef_runnable.h"
 #include "download_handler.h"
+#include "include/cef_download_handler.h"
+#include "include/cef_runnable.h"
 #include "util.h"
 #include <sstream>
 #include <stdio.h>

tests/cefclient/download_handler.h

@@ -5,7 +5,9 @@
 #ifndef _CEFCLIENT_DOWNLOAD_HANDLER_H
 #define _CEFCLIENT_DOWNLOAD_HANDLER_H
 
-#include "include/cef.h"
+#include "include/cef_base.h"
+
+class CefDownloadHandler;
 
 // Implement this interface to receive download notifications.
 class DownloadListener : public virtual CefBase

tests/cefclient/extension_test.cpp

@@ -3,6 +3,10 @@
 // can be found in the LICENSE file.
 
 #include "extension_test.h"
+#include "include/cef_browser.h"
+#include "include/cef_frame.h"
+#include "include/cef_stream.h"
+#include "include/cef_v8.h"
 #include "resource_util.h"
 
 // Implementation of the V8 handler class for the "cef.test" extension.

tests/cefclient/extension_test.h

@@ -5,7 +5,9 @@
 #ifndef _CEFCLIENT_EXTENSION_TEST_H
 #define _CEFCLIENT_EXTENSION_TEST_H
 
-#include "include/cef.h"
+#include "include/cef_base.h"
+
+class CefBrowser;
 
 // Register the V8 extension handler.
 void InitExtensionTest();

tests/cefclient/osrplugin.cpp

@@ -3,10 +3,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "include/cef.h"
+#include "osrplugin.h"
+#include "include/cef_browser.h"
+#include "include/cef_frame.h"
 #include "cefclient.h"
 #include "client_popup_handler.h"
-#include "osrplugin.h"
 #include "resource.h"
 #include "resource_util.h"
 #include "string_util.h"

tests/cefclient/osrplugin.h

@@ -9,11 +9,14 @@
 #ifndef _CEFCLIENT_OSRPLUGIN_H
 #define _CEFCLIENT_OSRPLUGIN_H
 
-#include "include/cef.h"
-#include "include/cef_nplugin.h"
+#include "include/cef_base.h"
 
 #if defined(OS_WIN)
 
+#include "include/cef_nplugin.h"
+
+class CefBrowser;
+
 extern NPNetscapeFuncs* g_osrbrowser;
 
 NPError API_CALL NP_OSRGetEntryPoints(NPPluginFuncs* pFuncs);

tests/cefclient/osrplugin_test.cpp

@@ -3,6 +3,8 @@
 // can be found in the LICENSE file.
 
 #include "osrplugin_test.h"
+#include "include/cef_browser.h"
+#include "include/cef_frame.h"
 #include "osrplugin.h"
 #include "cefclient.h"
 #include "client_handler.h"

tests/cefclient/osrplugin_test.h

@@ -5,7 +5,9 @@
 #ifndef _CEFCLIENT_OSRPLUGIN_TEST_H
 #define _CEFCLIENT_OSRPLUGIN_TEST_H
 
-#include "include/cef.h"
+#include "include/cef_base.h"
+
+class CefBrowser;
 
 // Register the internal client plugin and V8 extension.
 void InitOSRPluginTest();

tests/cefclient/plugin_test.cpp

@@ -2,7 +2,10 @@
 // reserved. Use of this source code is governed by a BSD-style license that
 // can be found in the LICENSE file.
 
-#include "include/cef.h"
+#include "include/cef_base.h"
+#include "include/cef_browser.h"
+#include "include/cef_frame.h"
+#include "include/cef_nplugin.h"
 #include "clientplugin.h"
 
 void InitPluginTest()

tests/cefclient/plugin_test.h

@@ -5,7 +5,9 @@
 #ifndef _CEFCLIENT_PLUGIN_TEST_H
 #define _CEFCLIENT_PLUGIN_TEST_H
 
-#include "include/cef.h"
+#include "include/cef_base.h"
+
+class CefBrowser;
 
 // Register the internal client plugin.
 void InitPluginTest();

tests/cefclient/resource_util.h

@@ -5,7 +5,9 @@
 #ifndef _CEFCLIENT_RESOURCE_UTIL
 #define _CEFCLIENT_RESOURCE_UTIL
 
-#include "include/cef.h"
+#include "include/cef_base.h"
+
+class CefStreamReader;
 
 #if defined(OS_WIN)
 

tests/cefclient/resource_util_linux.cpp

@@ -4,6 +4,7 @@
 // found in the LICENSE file.
 
 #include "resource_util.h"
+#include "include/cef_stream.h"
 #include "util.h"
 #include <stdio.h>
 

tests/cefclient/resource_util_mac.mm

@@ -4,6 +4,7 @@
 // found in the LICENSE file.
 
 #include "resource_util.h"
+#include "include/cef_stream.h"
 #include "util.h"
 
 #import <Foundation/Foundation.h>

tests/cefclient/resource_util_win.cpp

@@ -3,7 +3,8 @@
 // can be found in the LICENSE file.
 
 #include "resource_util.h"
-#include "include/cef_wrapper.h"
+#include "include/cef_stream.h"
+#include "include/wrapper/cef_byte_read_handler.h"
 
 #if defined(OS_WIN)
 

tests/cefclient/scheme_test.cpp

@@ -1,10 +1,14 @@
-// Copyright (c) 2009 The Chromium Embedded Framework Authors. All rights
+// Copyright (c) 2011 The Chromium Embedded Framework Authors. All rights
 // reserved. Use of this source code is governed by a BSD-style license that
 // can be found in the LICENSE file.
 
-#include "include/cef_wrapper.h"
-#include "resource_util.h"
 #include "scheme_test.h"
+#include "include/cef_browser.h"
+#include "include/cef_frame.h"
+#include "include/cef_response.h"
+#include "include/cef_request.h"
+#include "include/cef_scheme.h"
+#include "resource_util.h"
 #include "string_util.h"
 #include "util.h"
 

tests/cefclient/scheme_test.h

@@ -5,7 +5,9 @@
 #ifndef _CEFCLIENT_SCHEME_TEST
 #define _CEFCLIENT_SCHEME_TEST
 
-#include "include/cef.h"
+#include "include/cef_base.h"
+
+class CefBrowser;
 
 // Register the scheme handler.
 void InitSchemeTest();

tests/cefclient/string_util.cpp

@@ -3,6 +3,7 @@
 // can be found in the LICENSE file.
 
 #include "string_util.h"
+#include "include/cef_request.h"
 #include <sstream>
 
 void DumpRequestContents(CefRefPtr<CefRequest> request, std::string& str)

tests/cefclient/string_util.h

@@ -5,7 +5,9 @@
 #ifndef _CEFCLIENT_STRING_UTIL_H
 #define _CEFCLIENT_STRING_UTIL_H
 
-#include "include/cef.h"
+#include "include/cef_base.h"
+
+class CefRequest;
 
 // Dump the contents of the request into a string.
 void DumpRequestContents(CefRefPtr<CefRequest> request, std::string& str);

tests/cefclient/uiplugin.cpp

@@ -4,6 +4,8 @@
 // found in the LICENSE file.
 
 #include "uiplugin.h"
+#include "include/cef_browser.h"
+#include "include/cef_frame.h"
 #include "cefclient.h"
 #include <gl/gl.h>
 #include <sstream>

tests/cefclient/uiplugin_test.cpp

@@ -3,6 +3,9 @@
 // can be found in the LICENSE file.
 
 #include "uiplugin_test.h"
+#include "include/cef_browser.h"
+#include "include/cef_frame.h"
+#include "include/cef_v8.h"
 #include "uiplugin.h"
 #include "cefclient.h"
 

tests/cefclient/uiplugin_test.h

@@ -5,7 +5,9 @@
 #ifndef _CEFCLIENT_UIPLUGIN_TEST_H
 #define _CEFCLIENT_UIPLUGIN_TEST_H
 
-#include "include/cef.h"
+#include "include/cef_base.h"
+
+class CefBrowser;
 
 // Register the internal client plugin and V8 extension.
 void InitUIPluginTest();

tests/cefclient/util.h

@@ -5,7 +5,7 @@
 #ifndef _CEFCLIENT_UTIL_H
 #define _CEFCLIENT_UTIL_H
 
-#include "include/cef.h"
+#include "include/cef_task.h"
 
 #if defined(OS_WIN)
 

tests/unittests/command_line_unittest.cc

@@ -2,7 +2,7 @@
 // reserved. Use of this source code is governed by a BSD-style license that
 // can be found in the LICENSE file.
 
-#include "include/cef.h"
+#include "include/cef_command_line.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {

tests/unittests/content_filter_unittest.cc

@@ -2,7 +2,7 @@
 // reserved. Use of this source code is governed by a BSD-style license that
 // can be found in the LICENSE file.
 
-#include "include/cef.h"
+#include "include/cef_content_filter.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "test_handler.h"
 

tests/unittests/cookie_unittest.cc

@@ -2,10 +2,10 @@
 // reserved. Use of this source code is governed by a BSD-style license that
 // can be found in the LICENSE file.
 
+#include "include/cef_cookie.h"
+#include "include/cef_runnable.h"
 #include "base/scoped_temp_dir.h"
 #include "base/synchronization/waitable_event.h"
-#include "include/cef.h"
-#include "include/cef_runnable.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "test_suite.h"
 #include <vector>

tests/unittests/dom_unittest.cc

@@ -2,7 +2,7 @@
 // reserved. Use of this source code is governed by a BSD-style license that
 // can be found in the LICENSE file.
 
-#include "include/cef.h"
+#include "include/cef_dom.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "test_handler.h"
 

tests/unittests/navigation_unittest.cc

@@ -2,7 +2,7 @@
 // reserved. Use of this source code is governed by a BSD-style license that
 // can be found in the LICENSE file.
 
-#include "include/cef.h"
+#include "include/cef_scheme.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "test_handler.h"
 

tests/unittests/request_unittest.cc

@@ -2,7 +2,7 @@
 // reserved. Use of this source code is governed by a BSD-style license that
 // can be found in the LICENSE file.
 
-#include "include/cef.h"
+#include "include/cef_request.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "test_handler.h"
 

tests/unittests/scheme_handler_unittest.cc

@@ -2,7 +2,8 @@
 // reserved. Use of this source code is governed by a BSD-style license that
 // can be found in the LICENSE file.
 
-#include "include/cef_runnable.h"
+#include "include/cef_origin_whitelist.h"
+#include "include/cef_scheme.h"
 #include "test_handler.h"
 
 namespace {

tests/unittests/storage_unittest.cc

@@ -2,8 +2,9 @@
 // reserved. Use of this source code is governed by a BSD-style license that
 // can be found in the LICENSE file.
 
+#include "include/cef_storage.h"
+#include "include/cef_v8.h"
 #include "base/scoped_temp_dir.h"
-#include "include/cef.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "test_handler.h"
 #include "test_suite.h"

tests/unittests/stream_unittest.cc

@@ -2,7 +2,7 @@
 // reserved. Use of this source code is governed by a BSD-style license that
 // can be found in the LICENSE file.
 
-#include "include/cef.h"
+#include "include/cef_stream.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 static void VerifyStreamReadBehavior(CefRefPtr<CefStreamReader> stream,

tests/unittests/test_handler.h

@@ -5,7 +5,9 @@
 #ifndef _TEST_HANDLER_H
 #define _TEST_HANDLER_H
 
-#include "include/cef.h"
+#include "include/cef_browser.h"
+#include "include/cef_frame.h"
+#include "include/cef_client.h"
 #include "include/cef_runnable.h"
 #include "base/synchronization/waitable_event.h"
 #include "testing/gtest/include/gtest/gtest.h"

tests/unittests/test_suite.cc

@@ -2,8 +2,8 @@
 // reserved. Use of this source code is governed by a BSD-style license that
 // can be found in the LICENSE file.
 
-#include "include/cef.h"
 #include "test_suite.h"
+#include "include/cef_app.h"
 #include "base/command_line.h"
 #include "build/build_config.h"
 #include "base/threading/platform_thread.h"

tests/unittests/url_unittest.cc

@@ -2,7 +2,7 @@
 // reserved. Use of this source code is governed by a BSD-style license that
 // can be found in the LICENSE file.
 
-#include "include/cef.h"
+#include "include/cef_url.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 TEST(URLTest, CreateURL)

tests/unittests/v8_unittest.cc

@@ -2,8 +2,7 @@
 // reserved. Use of this source code is governed by a BSD-style license that
 // can be found in the LICENSE file.
 
-#include "include/cef.h"
-#include "include/cef_runnable.h"
+#include "include/cef_v8.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "test_handler.h"
 

tests/unittests/web_urlrequest_unittest.cc

@@ -2,6 +2,7 @@
 // reserved. Use of this source code is governed by a BSD-style license that
 // can be found in the LICENSE file.
 
+#include "include/cef_web_urlrequest.h"
 #include "test_handler.h"
 
 //#define WEB_URLREQUEST_DEBUG

tests/unittests/xml_reader_unittest.cc

@@ -2,8 +2,9 @@
 // reserved. Use of this source code is governed by a BSD-style license that
 // can be found in the LICENSE file.
 
-#include "include/cef.h"
-#include "include/cef_wrapper.h"
+#include "include/cef_stream.h"
+#include "include/cef_xml_reader.h"
+#include "include/wrapper/cef_xml_object.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {

tests/unittests/zip_reader_unittest.cc

@@ -2,8 +2,9 @@
 // reserved. Use of this source code is governed by a BSD-style license that
 // can be found in the LICENSE file.
 
-#include "include/cef.h"
-#include "include/cef_wrapper.h"
+#include "include/cef_stream.h"
+#include "include/cef_zip_reader.h"
+#include "include/wrapper/cef_zip_archive.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {