bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-03-11 01:20:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

cefclient: Organize source files into directories by target process (browser, renderer, common) (issue #1500).

Browse Source 
git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@2014 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt 2015-01-31 00:55:56 +00:00
parent 52b02eb838
commit 5c28259c31
128 changed files with 695 additions and 547 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
cef.gyp
View File

@ -40,7 +40,6 @@
'sources': [
'<@(includes_common)',
'<@(includes_wrapper)',
'<@(cefclient_sources_common)',
],
'mac_bundle_resources': [
'<@(cefclient_bundle_resources_mac)',
@ -84,7 +83,7 @@
},
'VCManifestTool': {
'AdditionalManifestFiles': [
'tests/cefclient/cefclient.exe.manifest',
'tests/cefclient/resources/win/cefclient.exe.manifest',
],
},
},
@ -397,11 +396,11 @@
'libcef_dll_wrapper',
],
'sources': [
'tests/cefclient/client_app.cc',
'tests/cefclient/client_app.h',
'tests/cefclient/client_switches.cc',
'tests/cefclient/client_switches.h',
'tests/cefclient/resource_util.h',
'tests/cefclient/browser/resource_util.h',
'tests/cefclient/common/client_app.cc',
'tests/cefclient/common/client_app.h',
'tests/cefclient/common/client_switches.cc',
'tests/cefclient/common/client_switches.h',
'tests/cefclient/resources/osr_test.html',
'tests/unittests/browser_info_map_unittest.cc',
'tests/unittests/command_line_unittest.cc',
@ -478,13 +477,13 @@
'libcef',
],
'sources': [
'tests/cefclient/cefclient.rc',
'tests/cefclient/resource_util_win.cc',
'tests/cefclient/browser/resource_util_win.cc',
'tests/cefclient/resources/win/cefclient.rc',
],
'msvs_settings': {
'VCManifestTool': {
'AdditionalManifestFiles': [
'tests/cefclient/cefclient.exe.manifest',
'tests/cefclient/resources/win/cefclient.exe.manifest',
],
},
},
@ -567,8 +566,8 @@
],
},
'sources': [
'tests/cefclient/resource_util_mac.mm',
'tests/cefclient/resource_util_posix.cc',
'tests/cefclient/browser/resource_util_mac.mm',
'tests/cefclient/browser/resource_util_posix.cc',
'tests/unittests/os_rendering_unittest_mac.h',
'tests/unittests/os_rendering_unittest_mac.mm',
'tests/unittests/run_all_unittests_mac.mm',
@ -579,8 +578,8 @@
'libcef',
],
'sources': [
'tests/cefclient/resource_util_linux.cc',
'tests/cefclient/resource_util_posix.cc',
'tests/cefclient/browser/resource_util_linux.cc',
'tests/cefclient/browser/resource_util_posix.cc',
],
'copies': [
{
@ -1535,11 +1534,11 @@
'.',
],
'sources': [
'tests/cefclient/client_app.cc',
'tests/cefclient/client_app.h',
'tests/cefclient/client_switches.cc',
'tests/cefclient/client_switches.h',
'tests/cefclient/process_helper_mac.cc',
'tests/cefclient/common/client_app.cc',
'tests/cefclient/common/client_app.h',
'tests/cefclient/common/client_switches.cc',
'tests/cefclient/common/client_switches.h',
'tests/cefclient/renderer/process_helper_mac.cc',
'tests/unittests/client_app_delegates.cc',
'tests/unittests/cookie_unittest.cc',
'tests/unittests/dom_unittest.cc',

252
cef_paths2.gypi
View File

@ -133,7 +133,67 @@
'libcef_dll/wrapper/libcef_dll_wrapper2.cc',
'<@(autogen_client_side)',
],
'cefclient_bundle_resources_common': [
'cefclient_sources_browser': [
'tests/cefclient/browser/binding_test.cc',
'tests/cefclient/browser/binding_test.h',
'tests/cefclient/browser/browser_window.cc',
'tests/cefclient/browser/browser_window.h',
'tests/cefclient/browser/bytes_write_handler.cc',
'tests/cefclient/browser/bytes_write_handler.h',
'tests/cefclient/browser/client_app_delegates_browser.cc',
'tests/cefclient/browser/client_handler.cc',
'tests/cefclient/browser/client_handler.h',
'tests/cefclient/browser/client_handler_osr.cc',
'tests/cefclient/browser/client_handler_osr.h',
'tests/cefclient/browser/client_handler_std.cc',
'tests/cefclient/browser/client_handler_std.h',
'tests/cefclient/browser/client_types.h',
'tests/cefclient/browser/dialog_test.cc',
'tests/cefclient/browser/dialog_test.h',
'tests/cefclient/browser/main_context.cc',
'tests/cefclient/browser/main_context.h',
'tests/cefclient/browser/main_context_impl.cc',
'tests/cefclient/browser/main_context_impl.h',
'tests/cefclient/browser/main_message_loop.h',
'tests/cefclient/browser/main_message_loop.cc',
'tests/cefclient/browser/main_message_loop_std.h',
'tests/cefclient/browser/main_message_loop_std.cc',
'tests/cefclient/browser/osr_dragdrop_events.h',
'tests/cefclient/browser/osr_renderer.h',
'tests/cefclient/browser/osr_renderer.cc',
'tests/cefclient/browser/resource.h',
'tests/cefclient/browser/resource_util.h',
'tests/cefclient/browser/root_window.cc',
'tests/cefclient/browser/root_window.h',
'tests/cefclient/browser/root_window_manager.cc',
'tests/cefclient/browser/root_window_manager.h',
'tests/cefclient/browser/scheme_test.cc',
'tests/cefclient/browser/scheme_test.h',
'tests/cefclient/browser/temp_window.h',
'tests/cefclient/browser/test_runner.cc',
'tests/cefclient/browser/test_runner.h',
'tests/cefclient/browser/window_test.cc',
'tests/cefclient/browser/window_test.h',
],
'cefclient_sources_common': [
'tests/cefclient/common/client_app.cc',
'tests/cefclient/common/client_app.h',
'tests/cefclient/common/client_app_delegates_common.cc',
'tests/cefclient/common/client_switches.cc',
'tests/cefclient/common/client_switches.h',
'tests/cefclient/common/scheme_test_common.cc',
'tests/cefclient/common/scheme_test_common.h',
],
'cefclient_sources_renderer': [
'tests/cefclient/renderer/client_app_delegates_renderer.cc',
'tests/cefclient/renderer/client_renderer.cc',
'tests/cefclient/renderer/client_renderer.h',
'tests/cefclient/renderer/performance_test.cc',
'tests/cefclient/renderer/performance_test.h',
'tests/cefclient/renderer/performance_test_setup.h',
'tests/cefclient/renderer/performance_test_tests.cc',
],
'cefclient_sources_resources': [
'tests/cefclient/resources/binding.html',
'tests/cefclient/resources/dialogs.html',
'tests/cefclient/resources/localstorage.html',
@ -146,144 +206,90 @@
'tests/cefclient/resources/window.html',
'tests/cefclient/resources/xmlhttprequest.html',
],
'cefclient_sources_common': [
'tests/cefclient/binding_test.cc',
'tests/cefclient/binding_test.h',
'tests/cefclient/browser_window.cc',
'tests/cefclient/browser_window.h',
'tests/cefclient/bytes_write_handler.cc',
'tests/cefclient/bytes_write_handler.h',
'tests/cefclient/client_app.cc',
'tests/cefclient/client_app.h',
'tests/cefclient/client_app_delegates.cc',
'tests/cefclient/client_handler.cc',
'tests/cefclient/client_handler.h',
'tests/cefclient/client_handler_osr.cc',
'tests/cefclient/client_handler_osr.h',
'tests/cefclient/client_handler_std.cc',
'tests/cefclient/client_handler_std.h',
'tests/cefclient/client_renderer.cc',
'tests/cefclient/client_renderer.h',
'tests/cefclient/client_switches.cc',
'tests/cefclient/client_switches.h',
'tests/cefclient/client_types.h',
'tests/cefclient/dialog_test.cc',
'tests/cefclient/dialog_test.h',
'tests/cefclient/main_context.cc',
'tests/cefclient/main_context.h',
'tests/cefclient/main_context_impl.cc',
'tests/cefclient/main_context_impl.h',
'tests/cefclient/main_message_loop.h',
'tests/cefclient/main_message_loop.cc',
'tests/cefclient/main_message_loop_std.h',
'tests/cefclient/main_message_loop_std.cc',
'tests/cefclient/osr_dragdrop_events.h',
'tests/cefclient/osr_renderer.h',
'tests/cefclient/osr_renderer.cc',
'tests/cefclient/performance_test.cc',
'tests/cefclient/performance_test.h',
'tests/cefclient/performance_test_setup.h',
'tests/cefclient/performance_test_tests.cc',
'tests/cefclient/resource.h',
'tests/cefclient/resource_util.h',
'tests/cefclient/root_window.cc',
'tests/cefclient/root_window.h',
'tests/cefclient/root_window_manager.cc',
'tests/cefclient/root_window_manager.h',
'tests/cefclient/scheme_test.cc',
'tests/cefclient/scheme_test.h',
'tests/cefclient/scheme_test_common.cc',
'tests/cefclient/temp_window.h',
'tests/cefclient/test_runner.cc',
'tests/cefclient/test_runner.h',
'tests/cefclient/window_test.cc',
'tests/cefclient/window_test.h',
'<@(cefclient_bundle_resources_common)',
],
'cefclient_sources_win': [
'tests/cefclient/browser_window_osr_win.cc',
'tests/cefclient/browser_window_osr_win.h',
'tests/cefclient/browser_window_std_win.cc',
'tests/cefclient/browser_window_std_win.h',
'tests/cefclient/cefclient.exe.manifest',
'tests/cefclient/cefclient.rc',
'tests/cefclient/cefclient_win.cc',
'tests/cefclient/main_context_impl_win.cc',
'tests/cefclient/main_message_loop_multithreaded_win.cc',
'tests/cefclient/main_message_loop_multithreaded_win.h',
'tests/cefclient/osr_dragdrop_win.cc',
'tests/cefclient/osr_dragdrop_win.h',
'tests/cefclient/osr_window_win.cc',
'tests/cefclient/osr_window_win.h',
'tests/cefclient/browser/browser_window_osr_win.cc',
'tests/cefclient/browser/browser_window_osr_win.h',
'tests/cefclient/browser/browser_window_std_win.cc',
'tests/cefclient/browser/browser_window_std_win.h',
'tests/cefclient/browser/cefclient_win.cc',
'tests/cefclient/browser/main_context_impl_win.cc',
'tests/cefclient/browser/main_message_loop_multithreaded_win.cc',
'tests/cefclient/browser/main_message_loop_multithreaded_win.h',
'tests/cefclient/browser/osr_dragdrop_win.cc',
'tests/cefclient/browser/osr_dragdrop_win.h',
'tests/cefclient/browser/osr_window_win.cc',
'tests/cefclient/browser/osr_window_win.h',
'tests/cefclient/browser/resource_util_win.cc',
'tests/cefclient/browser/root_window_win.cc',
'tests/cefclient/browser/root_window_win.h',
'tests/cefclient/browser/temp_window_win.cc',
'tests/cefclient/browser/temp_window_win.h',
'tests/cefclient/browser/util_win.cc',
'tests/cefclient/browser/util_win.h',
'tests/cefclient/browser/window_test_win.cc',
'tests/cefclient/resources/win/cefclient.exe.manifest',
'tests/cefclient/resources/win/cefclient.ico',
'tests/cefclient/resources/win/cefclient.rc',
'tests/cefclient/resources/win/small.ico',
'tests/cefclient/resource_util_win.cc',
'tests/cefclient/root_window_win.cc',
'tests/cefclient/root_window_win.h',
'tests/cefclient/temp_window_win.cc',
'tests/cefclient/temp_window_win.h',
'tests/cefclient/util_win.cc',
'tests/cefclient/util_win.h',
'tests/cefclient/window_test_win.cc',
'<@(cefclient_sources_browser)',
'<@(cefclient_sources_common)',
'<@(cefclient_sources_renderer)',
'<@(cefclient_sources_resources)',
],
'cefclient_sources_mac': [
'tests/cefclient/browser_window_osr_mac.h',
'tests/cefclient/browser_window_osr_mac.mm',
'tests/cefclient/browser_window_std_mac.h',
'tests/cefclient/browser_window_std_mac.mm',
'tests/cefclient/cefclient_mac.mm',
'tests/cefclient/main_context_impl_posix.cc',
'tests/cefclient/resource_util_mac.mm',
'tests/cefclient/resource_util_posix.cc',
'tests/cefclient/root_window_mac.h',
'tests/cefclient/root_window_mac.mm',
'tests/cefclient/temp_window_mac.h',
'tests/cefclient/temp_window_mac.mm',
'tests/cefclient/window_test_mac.mm',
],
'tests/cefclient/browser/browser_window_osr_mac.h',
'tests/cefclient/browser/browser_window_osr_mac.mm',
'tests/cefclient/browser/browser_window_std_mac.h',
'tests/cefclient/browser/browser_window_std_mac.mm',
'tests/cefclient/browser/cefclient_mac.mm',
'tests/cefclient/browser/main_context_impl_posix.cc',
'tests/cefclient/browser/resource_util_mac.mm',
'tests/cefclient/browser/resource_util_posix.cc',
'tests/cefclient/browser/root_window_mac.h',
'tests/cefclient/browser/root_window_mac.mm',
'tests/cefclient/browser/temp_window_mac.h',
'tests/cefclient/browser/temp_window_mac.mm',
'tests/cefclient/browser/window_test_mac.mm',
'<@(cefclient_sources_browser)',
'<@(cefclient_sources_common)',
],
'cefclient_sources_mac_helper': [
'tests/cefclient/client_app.cc',
'tests/cefclient/client_app.h',
'tests/cefclient/client_app_delegates.cc',
'tests/cefclient/client_renderer.cc',
'tests/cefclient/client_renderer.h',
'tests/cefclient/client_switches.cc',
'tests/cefclient/client_switches.h',
'tests/cefclient/performance_test.cc',
'tests/cefclient/performance_test.h',
'tests/cefclient/performance_test_setup.h',
'tests/cefclient/performance_test_tests.cc',
'tests/cefclient/process_helper_mac.cc',
'tests/cefclient/scheme_test_common.cc',
'tests/cefclient/renderer/client_app_delegates_stubs_mac.cc',
'tests/cefclient/renderer/process_helper_mac.cc',
'<@(cefclient_sources_common)',
'<@(cefclient_sources_renderer)',
],
'cefclient_bundle_resources_mac': [
'tests/cefclient/resources/mac/cefclient.icns',
'tests/cefclient/resources/mac/English.lproj/InfoPlist.strings',
'tests/cefclient/resources/mac/English.lproj/MainMenu.xib',
'tests/cefclient/resources/mac/Info.plist',
'<@(cefclient_bundle_resources_common)',
'<@(cefclient_sources_resources)',
],
'cefclient_sources_linux': [
'tests/cefclient/cefclient_gtk.cc',
'tests/cefclient/browser_window_osr_gtk.cc',
'tests/cefclient/browser_window_osr_gtk.h',
'tests/cefclient/browser_window_std_gtk.cc',
'tests/cefclient/browser_window_std_gtk.h',
'tests/cefclient/dialog_handler_gtk.cc',
'tests/cefclient/dialog_handler_gtk.h',
'tests/cefclient/main_context_impl_posix.cc',
'tests/cefclient/print_handler_gtk.cc',
'tests/cefclient/print_handler_gtk.h',
'tests/cefclient/resource_util_linux.cc',
'tests/cefclient/resource_util_posix.cc',
'tests/cefclient/root_window_gtk.cc',
'tests/cefclient/root_window_gtk.h',
'tests/cefclient/temp_window_x11.cc',
'tests/cefclient/temp_window_x11.h',
'tests/cefclient/window_test_gtk.cc',
'tests/cefclient/browser/cefclient_gtk.cc',
'tests/cefclient/browser/browser_window_osr_gtk.cc',
'tests/cefclient/browser/browser_window_osr_gtk.h',
'tests/cefclient/browser/browser_window_std_gtk.cc',
'tests/cefclient/browser/browser_window_std_gtk.h',
'tests/cefclient/browser/dialog_handler_gtk.cc',
'tests/cefclient/browser/dialog_handler_gtk.h',
'tests/cefclient/browser/main_context_impl_posix.cc',
'tests/cefclient/browser/print_handler_gtk.cc',
'tests/cefclient/browser/print_handler_gtk.h',
'tests/cefclient/browser/resource_util_linux.cc',
'tests/cefclient/browser/resource_util_posix.cc',
'tests/cefclient/browser/root_window_gtk.cc',
'tests/cefclient/browser/root_window_gtk.h',
'tests/cefclient/browser/temp_window_x11.cc',
'tests/cefclient/browser/temp_window_x11.h',
'tests/cefclient/browser/window_test_gtk.cc',
'<@(cefclient_sources_browser)',
'<@(cefclient_sources_common)',
'<@(cefclient_sources_renderer)',
],
'cefclient_bundle_resources_linux': [
'<@(cefclient_bundle_resources_common)',
'<@(cefclient_sources_resources)',
],
'cefsimple_sources_common': [
'tests/cefsimple/simple_app.cc',

4
macros.cmake.in
View File

@ -258,12 +258,12 @@ endif(OS_MACOSX)
if(OS_WINDOWS)
# Add custom manifest files to an executable target.
macro(ADD_WINDOWS_MANIFEST target)
macro(ADD_WINDOWS_MANIFEST manifest_path target)
add_custom_command(
TARGET ${target}
POST_BUILD
COMMAND "mt.exe" -nologo
-manifest \"${CMAKE_CURRENT_SOURCE_DIR}/${target}.exe.manifest\" \"${CMAKE_CURRENT_SOURCE_DIR}/compatibility.manifest\"
-manifest \"${manifest_path}/${target}.exe.manifest\" \"${manifest_path}/compatibility.manifest\"
-outputresource:"${CEF_TARGET_OUT_DIR}/${target}.exe"\;\#1
COMMENT "Adding manifest..."
)

14
tests/cefclient/CMakeLists.txt.in
View File

@ -11,19 +11,25 @@
'prefix': 'cefclient',
'set': 'CEFCLIENT_SRCS',
'includes': [
'cefclient_sources_browser',
'cefclient_sources_common',
'cefclient_bundle_resources_common',
'cefclient_sources_linux:LINUX',
'cefclient_sources_renderer:LINUX',
'cefclient_sources_renderer:WINDOWS',
'cefclient_sources_resources:WINDOWS',
'cefclient_sources_win:WINDOWS',
'cefclient_sources_mac:MACOSX',
'cefclient_sources_linux:LINUX',
],
}}
# cefclient helper sources.
{{
'prefix': 'cefclient_helper',
'set': 'CEFCLIENT_HELPER_SRCS',
'includes': [
'cefclient_sources_common:MACOSX',
'cefclient_sources_mac_helper:MACOSX',
'cefclient_sources_renderer:MACOSX',
],
}}
@ -32,8 +38,8 @@
'prefix': 'cefclient_resources',
'set': 'CEFCLIENT_RESOURCES_SRCS',
'includes': [
'cefclient_bundle_resources_common',
'cefclient_bundle_resources_mac:MACOSX',
'cefclient_sources_resources',
],
}}
@ -166,7 +172,7 @@ if(OS_WINDOWS)
endif()
# Add the custom manifest files to the executable.
ADD_WINDOWS_MANIFEST("${CEF_TARGET}")
ADD_WINDOWS_MANIFEST("${CMAKE_CURRENT_SOURCE_DIR}/resources/win" "${CEF_TARGET}")
# Copy CEF binary and resource files to the target output directory.
COPY_FILES("${CEF_TARGET}" "${CEF_BINARY_FILES}" "${CEF_BINARY_DIR}" "${CEF_TARGET_OUT_DIR}")

2
tests/cefclient/binding_test.cc → tests/cefclient/browser/binding_test.cc
View File

@ -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 "cefclient/binding_test.h"
#include "cefclient/browser/binding_test.h"
#include <algorithm>
#include <string>

8
tests/cefclient/binding_test.h → tests/cefclient/browser/binding_test.h
View File

@ -2,11 +2,11 @@
// reserved. Use of this source code is governed by a BSD-style license that
// can be found in the LICENSE file.
#ifndef CEF_TESTS_CEFCLIENT_BINDING_TEST_H_
#define CEF_TESTS_CEFCLIENT_BINDING_TEST_H_
#ifndef CEF_TESTS_CEFCLIENT_BROWSER_BINDING_TEST_H_
#define CEF_TESTS_CEFCLIENT_BROWSER_BINDING_TEST_H_
#pragma once
#include "cefclient/test_runner.h"
#include "cefclient/browser/test_runner.h"
namespace client {
namespace binding_test {
@ -17,4 +17,4 @@ void CreateMessageHandlers(test_runner::MessageHandlerSet& handlers);
} // namespace binding_test
} // namespace client
#endif // CEF_TESTS_CEFCLIENT_BINDING_TEST_H_
#endif // CEF_TESTS_CEFCLIENT_BROWSER_BINDING_TEST_H_

4
tests/cefclient/browser_window.cc → tests/cefclient/browser/browser_window.cc
View File

@ -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 "cefclient/browser_window.h"
#include "cefclient/browser/browser_window.h"
#include "include/base/cef_bind.h"
#include "cefclient/main_message_loop.h"
#include "cefclient/browser/main_message_loop.h"
namespace client {

12
tests/cefclient/browser_window.h → tests/cefclient/browser/browser_window.h
View File

@ -2,13 +2,14 @@
// reserved. Use of this source code is governed by a BSD-style license that
// can be found in the LICENSE file.
#ifndef CEF_TESTS_CEFCLIENT_BROWSER_WINDOW_H_
#define CEF_TESTS_CEFCLIENT_BROWSER_WINDOW_H_
#ifndef CEF_TESTS_CEFCLIENT_BROWSER_BROWSER_WINDOW_H_
#define CEF_TESTS_CEFCLIENT_BROWSER_BROWSER_WINDOW_H_
#pragma once
#include "include/base/cef_scoped_ptr.h"
#include "include/cef_browser.h"
#include "cefclient/client_handler.h"
#include "cefclient/client_types.h"
#include "cefclient/browser/client_handler.h"
#include "cefclient/browser/client_types.h"
namespace client {
@ -105,9 +106,10 @@ class BrowserWindow : public ClientHandler::Delegate {
CefRefPtr<ClientHandler> client_handler_;
bool is_closing_;
private:
DISALLOW_COPY_AND_ASSIGN(BrowserWindow);
};
} // namespace client
#endif // CEF_TESTS_CEFCLIENT_BROWSER_WINDOW_H_
#endif // CEF_TESTS_CEFCLIENT_BROWSER_BROWSER_WINDOW_H_

4
tests/cefclient/browser_window_osr_gtk.cc → tests/cefclient/browser/browser_window_osr_gtk.cc
View File

@ -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 "cefclient/browser_window_osr_gtk.h"
#include "cefclient/browser/browser_window_osr_gtk.h"
#include <gdk/gdk.h>
#include <gdk/gdkkeysyms.h>
@ -19,7 +19,7 @@
#include "include/base/cef_logging.h"
#include "include/wrapper/cef_closure_task.h"
#include "cefclient/main_message_loop.h"
#include "cefclient/browser/main_message_loop.h"
namespace client {

13
tests/cefclient/browser_window_osr_gtk.h → tests/cefclient/browser/browser_window_osr_gtk.h
View File

@ -2,12 +2,13 @@
// reserved. Use of this source code is governed by a BSD-style license that
// can be found in the LICENSE file.
#ifndef CEF_TESTS_CEFCLIENT_BROWSER_WINDOW_OSR_GTK_H_
#define CEF_TESTS_CEFCLIENT_BROWSER_WINDOW_OSR_GTK_H_
#ifndef CEF_TESTS_CEFCLIENT_BROWSER_BROWSER_WINDOW_OSR_GTK_H_
#define CEF_TESTS_CEFCLIENT_BROWSER_BROWSER_WINDOW_OSR_GTK_H_
#pragma once
#include "cefclient/browser_window.h"
#include "cefclient/client_handler_osr.h"
#include "cefclient/osr_renderer.h"
#include "cefclient/browser/browser_window.h"
#include "cefclient/browser/client_handler_osr.h"
#include "cefclient/browser/osr_renderer.h"
namespace client {
@ -119,4 +120,4 @@ class BrowserWindowOsrGtk : public BrowserWindow,
} // namespace client
#endif // CEF_TESTS_CEFCLIENT_BROWSER_WINDOW_OSR_GTK_H_
#endif // CEF_TESTS_CEFCLIENT_BROWSER_BROWSER_WINDOW_OSR_GTK_H_

13
tests/cefclient/browser_window_osr_mac.h → tests/cefclient/browser/browser_window_osr_mac.h
View File

@ -2,12 +2,13 @@
// reserved. Use of this source code is governed by a BSD-style license that
// can be found in the LICENSE file.
#ifndef CEF_TESTS_CEFCLIENT_BROWSER_WINDOW_OSR_MAC_H_
#define CEF_TESTS_CEFCLIENT_BROWSER_WINDOW_OSR_MAC_H_
#ifndef CEF_TESTS_CEFCLIENT_BROWSER_BROWSER_WINDOW_OSR_MAC_H_
#define CEF_TESTS_CEFCLIENT_BROWSER_BROWSER_WINDOW_OSR_MAC_H_
#pragma once
#include "cefclient/browser_window.h"
#include "cefclient/client_handler_osr.h"
#include "cefclient/osr_renderer.h"
#include "cefclient/browser/browser_window.h"
#include "cefclient/browser/client_handler_osr.h"
#include "cefclient/browser/osr_renderer.h"
namespace client {
@ -91,4 +92,4 @@ class BrowserWindowOsrMac : public BrowserWindow,
} // namespace client
#endif // CEF_TESTS_CEFCLIENT_BROWSER_WINDOW_OSR_MAC_H_
#endif // CEF_TESTS_CEFCLIENT_BROWSER_BROWSER_WINDOW_OSR_MAC_H_

6
tests/cefclient/browser_window_osr_mac.mm → tests/cefclient/browser/browser_window_osr_mac.mm
View File

@ -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 "cefclient/browser_window_osr_mac.h"
#include "cefclient/browser/browser_window_osr_mac.h"
#include <Cocoa/Cocoa.h>
#import <objc/runtime.h>
@ -11,8 +11,8 @@
#include "include/base/cef_logging.h"
#include "include/cef_url.h"
#include "include/wrapper/cef_closure_task.h"
#include "cefclient/bytes_write_handler.h"
#include "cefclient/main_message_loop.h"
#include "cefclient/browser/bytes_write_handler.h"
#include "cefclient/browser/main_message_loop.h"
@interface BrowserOpenGLView
: NSOpenGLView <NSDraggingSource, NSDraggingDestination> {

4
tests/cefclient/browser_window_osr_win.cc → tests/cefclient/browser/browser_window_osr_win.cc
View File

@ -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 "cefclient/browser_window_osr_win.h"
#include "cefclient/browser/browser_window_osr_win.h"
#include "cefclient/main_message_loop.h"
#include "cefclient/browser/main_message_loop.h"
namespace client {

11
tests/cefclient/browser_window_osr_win.h → tests/cefclient/browser/browser_window_osr_win.h
View File

@ -2,11 +2,12 @@
// reserved. Use of this source code is governed by a BSD-style license that
// can be found in the LICENSE file.
#ifndef CEF_TESTS_CEFCLIENT_BROWSER_WINDOW_OSR_WIN_H_
#define CEF_TESTS_CEFCLIENT_BROWSER_WINDOW_OSR_WIN_H_
#ifndef CEF_TESTS_CEFCLIENT_BROWSER_BROWSER_WINDOW_OSR_WIN_H_
#define CEF_TESTS_CEFCLIENT_BROWSER_BROWSER_WINDOW_OSR_WIN_H_
#pragma once
#include "cefclient/browser_window.h"
#include "cefclient/osr_window_win.h"
#include "cefclient/browser/browser_window.h"
#include "cefclient/browser/osr_window_win.h"
namespace client {
@ -57,4 +58,4 @@ class BrowserWindowOsrWin : public BrowserWindow,
} // namespace client
#endif // CEF_TESTS_CEFCLIENT_BROWSER_WINDOW_OSR_WIN_H_
#endif // CEF_TESTS_CEFCLIENT_BROWSER_BROWSER_WINDOW_OSR_WIN_H_

7
tests/cefclient/browser_window_std_gtk.cc → tests/cefclient/browser/browser_window_std_gtk.cc
View File

@ -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 "cefclient/browser_window_std_gtk.h"
#include "cefclient/browser/browser_window_std_gtk.h"
#include <gtk/gtk.h>
#include <gdk/gdk.h>
@ -13,9 +13,8 @@
#undef RootWindow // Definition conflicts with root_window.h
#include "include/base/cef_logging.h"
#include "include/cef_app.h"
#include "cefclient/client_handler_std.h"
#include "cefclient/main_message_loop.h"
#include "cefclient/browser/client_handler_std.h"
#include "cefclient/browser/main_message_loop.h"
namespace client {

9
tests/cefclient/browser_window_std_gtk.h → tests/cefclient/browser/browser_window_std_gtk.h
View File

@ -2,10 +2,11 @@
// reserved. Use of this source code is governed by a BSD-style license that
// can be found in the LICENSE file.
#ifndef CEF_TESTS_CEFCLIENT_BROWSER_WINDOW_STD_GTK_H_
#define CEF_TESTS_CEFCLIENT_BROWSER_WINDOW_STD_GTK_H_
#ifndef CEF_TESTS_CEFCLIENT_BROWSER_BROWSER_WINDOW_STD_GTK_H_
#define CEF_TESTS_CEFCLIENT_BROWSER_BROWSER_WINDOW_STD_GTK_H_
#pragma once
#include "cefclient/browser_window.h"
#include "cefclient/browser/browser_window.h"
namespace client {
@ -41,4 +42,4 @@ class BrowserWindowStdGtk : public BrowserWindow {
} // namespace client
#endif // CEF_TESTS_CEFCLIENT_BROWSER_WINDOW_STD_GTK_H_
#endif // CEF_TESTS_CEFCLIENT_BROWSER_BROWSER_WINDOW_STD_GTK_H_

9
tests/cefclient/browser_window_std_mac.h → tests/cefclient/browser/browser_window_std_mac.h
View File

@ -2,10 +2,11 @@
// reserved. Use of this source code is governed by a BSD-style license that
// can be found in the LICENSE file.
#ifndef CEF_TESTS_CEFCLIENT_BROWSER_WINDOW_STD_MAC_H_
#define CEF_TESTS_CEFCLIENT_BROWSER_WINDOW_STD_MAC_H_
#ifndef CEF_TESTS_CEFCLIENT_BROWSER_BROWSER_WINDOW_STD_MAC_H_
#define CEF_TESTS_CEFCLIENT_BROWSER_BROWSER_WINDOW_STD_MAC_H_
#pragma once
#include "cefclient/browser_window.h"
#include "cefclient/browser/browser_window.h"
namespace client {
@ -41,4 +42,4 @@ class BrowserWindowStdMac : public BrowserWindow {
} // namespace client
#endif // CEF_TESTS_CEFCLIENT_BROWSER_WINDOW_STD_MAC_H_
#endif // CEF_TESTS_CEFCLIENT_BROWSER_BROWSER_WINDOW_STD_MAC_H_

7
tests/cefclient/browser_window_std_mac.mm → tests/cefclient/browser/browser_window_std_mac.mm
View File

@ -2,14 +2,13 @@
// reserved. Use of this source code is governed by a BSD-style license that
// can be found in the LICENSE file.
#include "cefclient/browser_window_std_mac.h"
#include "cefclient/browser/browser_window_std_mac.h"
#include <Cocoa/Cocoa.h>
#include "include/base/cef_logging.h"
#include "include/cef_app.h"
#include "cefclient/client_handler_std.h"
#include "cefclient/main_message_loop.h"
#include "cefclient/browser/client_handler_std.h"
#include "cefclient/browser/main_message_loop.h"
namespace client {

6
tests/cefclient/browser_window_std_win.cc → tests/cefclient/browser/browser_window_std_win.cc
View File

@ -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 "cefclient/browser_window_std_win.h"
#include "cefclient/browser/browser_window_std_win.h"
#include "cefclient/client_handler_std.h"
#include "cefclient/main_message_loop.h"
#include "cefclient/browser/client_handler_std.h"
#include "cefclient/browser/main_message_loop.h"
namespace client {

9
tests/cefclient/browser_window_std_win.h → tests/cefclient/browser/browser_window_std_win.h
View File

@ -2,10 +2,11 @@
// reserved. Use of this source code is governed by a BSD-style license that
// can be found in the LICENSE file.
#ifndef CEF_TESTS_CEFCLIENT_BROWSER_WINDOW_STD_WIN_H_
#define CEF_TESTS_CEFCLIENT_BROWSER_WINDOW_STD_WIN_H_
#ifndef CEF_TESTS_CEFCLIENT_BROWSER_BROWSER_WINDOW_STD_WIN_H_
#define CEF_TESTS_CEFCLIENT_BROWSER_BROWSER_WINDOW_STD_WIN_H_
#pragma once
#include "cefclient/browser_window.h"
#include "cefclient/browser/browser_window.h"
namespace client {
@ -41,4 +42,4 @@ class BrowserWindowStdWin : public BrowserWindow {
} // namespace client
#endif // CEF_TESTS_CEFCLIENT_BROWSER_WINDOW_STD_WIN_H_
#endif // CEF_TESTS_CEFCLIENT_BROWSER_BROWSER_WINDOW_STD_WIN_H_

2
tests/cefclient/bytes_write_handler.cc → tests/cefclient/browser/bytes_write_handler.cc
View File

@ -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 "cefclient/bytes_write_handler.h"
#include "cefclient/browser/bytes_write_handler.h"
#include <cstdio>
#include <cstdlib>

8
tests/cefclient/bytes_write_handler.h → tests/cefclient/browser/bytes_write_handler.h
View File

@ -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.
#ifndef CEF_TESTS_CEFCLIENT_BYTES_WRITE_HANDLER_H_
#define CEF_TESTS_CEFCLIENT_BYTES_WRITE_HANDLER_H_
#ifndef CEF_TESTS_CEFCLIENT_BROWSER_BYTES_WRITE_HANDLER_H_
#define CEF_TESTS_CEFCLIENT_BROWSER_BYTES_WRITE_HANDLER_H_
#pragma once
#include "include/base/cef_lock.h"
@ -25,7 +25,7 @@ class BytesWriteHandler : public CefWriteHandler {
void* GetData() { return data_; }
int64 GetDataSize() { return offset_; }
protected:
private:
size_t Grow(size_t size);
size_t grow_;
@ -41,4 +41,4 @@ class BytesWriteHandler : public CefWriteHandler {
} // namespace client
#endif // CEF_TESTS_CEFCLIENT_BYTES_WRITE_HANDLER_H_
#endif // CEF_TESTS_CEFCLIENT_BROWSER_BYTES_WRITE_HANDLER_H_

8
tests/cefclient/cefclient_gtk.cc → tests/cefclient/browser/cefclient_gtk.cc
View File

@ -17,10 +17,10 @@
#include "include/base/cef_scoped_ptr.h"
#include "include/cef_app.h"
#include "include/wrapper/cef_helpers.h"
#include "cefclient/client_app.h"
#include "cefclient/main_context_impl.h"
#include "cefclient/main_message_loop_std.h"
#include "cefclient/test_runner.h"
#include "cefclient/browser/main_context_impl.h"
#include "cefclient/browser/main_message_loop_std.h"
#include "cefclient/browser/test_runner.h"
#include "cefclient/common/client_app.h"
namespace client {
namespace {

23
tests/cefclient/cefclient_mac.mm → tests/cefclient/browser/cefclient_mac.mm
View File

@ -6,13 +6,12 @@
#import <Cocoa/Cocoa.h>
#include "include/cef_app.h"
#import "include/cef_application_mac.h"
#include "cefclient/client_app.h"
#include "cefclient/client_switches.h"
#include "cefclient/main_context_impl.h"
#include "cefclient/main_message_loop_std.h"
#include "cefclient/resource.h"
#include "cefclient/root_window.h"
#include "cefclient/test_runner.h"
#include "cefclient/browser/main_context_impl.h"
#include "cefclient/browser/main_message_loop_std.h"
#include "cefclient/browser/resource.h"
#include "cefclient/browser/root_window.h"
#include "cefclient/browser/test_runner.h"
#include "cefclient/common/client_app.h"
namespace {
@ -177,8 +176,16 @@ void AddMenuItem(NSMenu *menu, NSString* label, int idval) {
@end
namespace client {
// Stub implementations of ClientApp methods that are only used in the renderer
// process.
// static
void ClientApp::CreateRenderDelegates(RenderDelegateSet& delegates) {
}
namespace {
int RunMain(int argc, char* argv[]) {

12
tests/cefclient/cefclient_win.cc → tests/cefclient/browser/cefclient_win.cc
View File

@ -6,12 +6,12 @@
#include "include/base/cef_scoped_ptr.h"
#include "include/cef_sandbox_win.h"
#include "cefclient/client_app.h"
#include "cefclient/main_context_impl.h"
#include "cefclient/main_message_loop_multithreaded_win.h"
#include "cefclient/main_message_loop_std.h"
#include "cefclient/root_window_manager.h"
#include "cefclient/test_runner.h"
#include "cefclient/browser/main_context_impl.h"
#include "cefclient/browser/main_message_loop_multithreaded_win.h"
#include "cefclient/browser/main_message_loop_std.h"
#include "cefclient/browser/root_window_manager.h"
#include "cefclient/browser/test_runner.h"
#include "cefclient/common/client_app.h"
// When generating projects with CMake the CEF_USE_SANDBOX value will be defined
// automatically if using the required compiler version. Pass -DUSE_SANDBOX=OFF

26
tests/cefclient/browser/client_app_delegates_browser.cc Normal file
View File

@ -0,0 +1,26 @@
// Copyright (c) 2012 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/common/client_app.h"
#if defined(OS_LINUX)
#include "cefclient/browser/print_handler_gtk.h"
#endif
namespace client {
// static
void ClientApp::CreateBrowserDelegates(BrowserDelegateSet& delegates) {
}
// static
CefRefPtr<CefPrintHandler> ClientApp::CreatePrintHandler() {
#if defined(OS_LINUX)
return new ClientPrintHandlerGtk();
#else
return NULL;
#endif
}
} // namespace client

18
tests/cefclient/client_handler.cc → tests/cefclient/browser/client_handler.cc
View File

@ -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 "cefclient/client_handler.h"
#include "cefclient/browser/client_handler.h"
#include <stdio.h>
#include <algorithm>
@ -13,12 +13,11 @@
#include "include/cef_browser.h"
#include "include/cef_frame.h"
#include "include/wrapper/cef_closure_task.h"
#include "cefclient/client_renderer.h"
#include "cefclient/client_switches.h"
#include "cefclient/main_context.h"
#include "cefclient/resource_util.h"
#include "cefclient/root_window_manager.h"
#include "cefclient/test_runner.h"
#include "cefclient/browser/main_context.h"
#include "cefclient/browser/resource_util.h"
#include "cefclient/browser/root_window_manager.h"
#include "cefclient/browser/test_runner.h"
#include "cefclient/common/client_switches.h"
namespace client {
@ -42,6 +41,9 @@ enum client_menu_ids {
CLIENT_ID_TESTMENU_RADIOITEM3,
};
// Musr match the value in client_renderer.cc.
const char kFocusedNodeChangedMessage[] = "ClientRenderer.FocusedNodeChanged";
} // namespace
ClientHandler::ClientHandler(Delegate* delegate,
@ -92,7 +94,7 @@ bool ClientHandler::OnProcessMessageReceived(
// Check for messages from the client renderer.
std::string message_name = message->GetName();
if (message_name == renderer::kFocusedNodeChangedMessage) {
if (message_name == kFocusedNodeChangedMessage) {
// A message is sent from ClientRenderDelegate to tell us whether the
// currently focused DOM node is editable. Use of |focus_on_editable_field_|
// is redundant with CefKeyEvent.focus_on_editable_field in OnPreKeyEvent

10
tests/cefclient/client_handler.h → tests/cefclient/browser/client_handler.h
View File

@ -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.
#ifndef CEF_TESTS_CEFCLIENT_CLIENT_HANDLER_H_
#define CEF_TESTS_CEFCLIENT_CLIENT_HANDLER_H_
#ifndef CEF_TESTS_CEFCLIENT_BROWSER_CLIENT_HANDLER_H_
#define CEF_TESTS_CEFCLIENT_BROWSER_CLIENT_HANDLER_H_
#pragma once
#include <set>
@ -12,10 +12,10 @@
#include "include/cef_client.h"
#include "include/wrapper/cef_helpers.h"
#include "include/wrapper/cef_message_router.h"
#include "cefclient/client_types.h"
#include "cefclient/browser/client_types.h"
#if defined(OS_LINUX)
#include "cefclient/dialog_handler_gtk.h"
#include "cefclient/browser/dialog_handler_gtk.h"
#endif
namespace client {
@ -309,4 +309,4 @@ class ClientHandler : public CefClient,
} // namespace client
#endif // CEF_TESTS_CEFCLIENT_CLIENT_HANDLER_H_
#endif // CEF_TESTS_CEFCLIENT_BROWSER_CLIENT_HANDLER_H_

2
tests/cefclient/client_handler_osr.cc → tests/cefclient/browser/client_handler_osr.cc
View File

@ -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 "cefclient/client_handler_osr.h"
#include "cefclient/browser/client_handler_osr.h"
#include "include/base/cef_bind.h"
#include "include/wrapper/cef_closure_task.h"

9
tests/cefclient/client_handler_osr.h → tests/cefclient/browser/client_handler_osr.h
View File

@ -2,10 +2,11 @@
// reserved. Use of this source code is governed by a BSD-style license that
// can be found in the LICENSE file.
#ifndef CEF_TESTS_CEFCLIENT_CLIENT_HANDLER_OSR_H_
#define CEF_TESTS_CEFCLIENT_CLIENT_HANDLER_OSR_H_
#ifndef CEF_TESTS_CEFCLIENT_BROWSER_CLIENT_HANDLER_OSR_H_
#define CEF_TESTS_CEFCLIENT_BROWSER_CLIENT_HANDLER_OSR_H_
#pragma once
#include "cefclient/client_handler.h"
#include "cefclient/browser/client_handler.h"
namespace client {
@ -120,4 +121,4 @@ class ClientHandlerOsr : public ClientHandler,
} // namespace client
#endif // CEF_TESTS_CEFCLIENT_CLIENT_HANDLER_OSR_H_
#endif // CEF_TESTS_CEFCLIENT_BROWSER_CLIENT_HANDLER_OSR_H_

2
tests/cefclient/client_handler_std.cc → tests/cefclient/browser/client_handler_std.cc
View File

@ -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 "cefclient/client_handler_std.h"
#include "cefclient/browser/client_handler_std.h"
namespace client {

9
tests/cefclient/client_handler_std.h → tests/cefclient/browser/client_handler_std.h
View File

@ -2,10 +2,11 @@
// reserved. Use of this source code is governed by a BSD-style license that
// can be found in the LICENSE file.
#ifndef CEF_TESTS_CEFCLIENT_CLIENT_HANDLER_STD_H_
#define CEF_TESTS_CEFCLIENT_CLIENT_HANDLER_STD_H_
#ifndef CEF_TESTS_CEFCLIENT_BROWSER_CLIENT_HANDLER_STD_H_
#define CEF_TESTS_CEFCLIENT_BROWSER_CLIENT_HANDLER_STD_H_
#pragma once
#include "cefclient/client_handler.h"
#include "cefclient/browser/client_handler.h"
namespace client {
@ -24,4 +25,4 @@ class ClientHandlerStd : public ClientHandler {
} // namespace client
#endif // CEF_TESTS_CEFCLIENT_CLIENT_HANDLER_STD_H_
#endif // CEF_TESTS_CEFCLIENT_BROWSER_CLIENT_HANDLER_STD_H_

7
tests/cefclient/client_types.h → tests/cefclient/browser/client_types.h
View File

@ -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.
#ifndef CEF_TESTS_CEFCLIENT_CLIENT_TYPES_H_
#define CEF_TESTS_CEFCLIENT_CLIENT_TYPES_H_
#ifndef CEF_TESTS_CEFCLIENT_BROWSER_CLIENT_TYPES_H_
#define CEF_TESTS_CEFCLIENT_BROWSER_CLIENT_TYPES_H_
#pragma once
#include "include/cef_base.h"
@ -28,5 +29,5 @@ class NSWindow;
#endif
#endif // defined OS_MACOSX
#endif // CEF_TESTS_CEFCLIENT_CLIENT_TYPES_H_
#endif // CEF_TESTS_CEFCLIENT_BROWSER_CLIENT_TYPES_H_

4
tests/cefclient/dialog_handler_gtk.cc → tests/cefclient/browser/dialog_handler_gtk.cc
View File

@ -2,12 +2,12 @@
// reserved. Use of this source code is governed by a BSD-style license that
// can be found in the LICENSE file.
#include "cefclient/dialog_handler_gtk.h"
#include "cefclient/browser/dialog_handler_gtk.h"
#include "include/cef_browser.h"
#include "include/cef_url.h"
#include "include/wrapper/cef_helpers.h"
#include "cefclient/root_window.h"
#include "cefclient/browser/root_window.h"
namespace client {

6
tests/cefclient/dialog_handler_gtk.h → tests/cefclient/browser/dialog_handler_gtk.h
View File

@ -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.
#ifndef CEF_TESTS_CEFCLIENT_DIALOG_HANDLER_GTK_H_
#define CEF_TESTS_CEFCLIENT_DIALOG_HANDLER_GTK_H_
#ifndef CEF_TESTS_CEFCLIENT_BROWSER_DIALOG_HANDLER_GTK_H_
#define CEF_TESTS_CEFCLIENT_BROWSER_DIALOG_HANDLER_GTK_H_
#pragma once
#include <gtk/gtk.h>
@ -57,4 +57,4 @@ class ClientDialogHandlerGtk : public CefDialogHandler,
} // namespace client
#endif // CEF_TESTS_CEFCLIENT_DIALOG_HANDLER_GTK_H_
#endif // CEF_TESTS_CEFCLIENT_BROWSER_DIALOG_HANDLER_GTK_H_

2
tests/cefclient/dialog_test.cc → tests/cefclient/browser/dialog_test.cc
View File

@ -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 "cefclient/dialog_test.h"
#include "cefclient/browser/dialog_test.h"
#include <string>

8
tests/cefclient/dialog_test.h → tests/cefclient/browser/dialog_test.h
View File

@ -2,11 +2,11 @@
// reserved. Use of this source code is governed by a BSD-style license that
// can be found in the LICENSE file.
#ifndef CEF_TESTS_CEFCLIENT_DIALOG_TEST_H_
#define CEF_TESTS_CEFCLIENT_DIALOG_TEST_H_
#ifndef CEF_TESTS_CEFCLIENT_BROWSER_DIALOG_TEST_H_
#define CEF_TESTS_CEFCLIENT_BROWSER_DIALOG_TEST_H_
#pragma once
#include "cefclient/test_runner.h"
#include "cefclient/browser/test_runner.h"
namespace client {
namespace dialog_test {
@ -17,4 +17,4 @@ void CreateMessageHandlers(test_runner::MessageHandlerSet& handlers);
} // namespace dialog_test
} // namespace client
#endif // CEF_TESTS_CEFCLIENT_DIALOG_TEST_H_
#endif // CEF_TESTS_CEFCLIENT_BROWSER_DIALOG_TEST_H_

2
tests/cefclient/main_context.cc → tests/cefclient/browser/main_context.cc
View File

@ -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 "cefclient/main_context.h"
#include "cefclient/browser/main_context.h"
#include "include/base/cef_logging.h"

10
tests/cefclient/main_context.h → tests/cefclient/browser/main_context.h
View File

@ -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.
#ifndef CEF_TESTS_CEFCLIENT_MAIN_CONTEXT_H_
#define CEF_TESTS_CEFCLIENT_MAIN_CONTEXT_H_
#ifndef CEF_TESTS_CEFCLIENT_BROWSER_MAIN_CONTEXT_H_
#define CEF_TESTS_CEFCLIENT_BROWSER_MAIN_CONTEXT_H_
#pragma once
#include <string>
@ -43,10 +44,11 @@ class MainContext {
protected:
MainContext();
virtual ~MainContext();
private:
DISALLOW_COPY_AND_ASSIGN(MainContext);
};
} // namespace client
#endif // CEF_TESTS_CEFCLIENT_MAIN_CONTEXT_H_
#endif // CEF_TESTS_CEFCLIENT_BROWSER_MAIN_CONTEXT_H_

4
tests/cefclient/main_context_impl.cc → tests/cefclient/browser/main_context_impl.cc
View File

@ -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 "cefclient/main_context_impl.h"
#include "cefclient/browser/main_context_impl.h"
#include "cefclient/client_switches.h"
#include "cefclient/common/client_switches.h"
namespace client {

11
tests/cefclient/main_context_impl.h → tests/cefclient/browser/main_context_impl.h
View File

@ -2,15 +2,16 @@
// reserved. Use of this source code is governed by a BSD-style license that
// can be found in the LICENSE file.
#ifndef CEF_TESTS_CEFCLIENT_MAIN_CONTEXT_IMPL_H_
#define CEF_TESTS_CEFCLIENT_MAIN_CONTEXT_IMPL_H_
#ifndef CEF_TESTS_CEFCLIENT_BROWSER_MAIN_CONTEXT_IMPL_H_
#define CEF_TESTS_CEFCLIENT_BROWSER_MAIN_CONTEXT_IMPL_H_
#pragma once
#include "include/base/cef_scoped_ptr.h"
#include "include/base/cef_thread_checker.h"
#include "include/cef_app.h"
#include "include/cef_command_line.h"
#include "cefclient/main_context.h"
#include "cefclient/root_window_manager.h"
#include "cefclient/browser/main_context.h"
#include "cefclient/browser/root_window_manager.h"
namespace client {
@ -74,4 +75,4 @@ class MainContextImpl : public MainContext {
} // namespace client
#endif // CEF_TESTS_CEFCLIENT_MAIN_CONTEXT_IMPL_H_
#endif // CEF_TESTS_CEFCLIENT_BROWSER_MAIN_CONTEXT_IMPL_H_

2
tests/cefclient/main_context_impl_posix.cc → tests/cefclient/browser/main_context_impl_posix.cc
View File

@ -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 "cefclient/main_context_impl.h"
#include "cefclient/browser/main_context_impl.h"
#include <unistd.h>

4
tests/cefclient/main_context_impl_win.cc → tests/cefclient/browser/main_context_impl_win.cc
View File

@ -2,13 +2,11 @@
// reserved. Use of this source code is governed by a BSD-style license that
// can be found in the LICENSE file.
#include "cefclient/main_context_impl.h"
#include "cefclient/browser/main_context_impl.h"
#include <direct.h>
#include <shlobj.h>
#include "cefclient/root_window_manager.h"
namespace client {
std::string MainContextImpl::GetDownloadPath(const std::string& file_name) {

2
tests/cefclient/main_message_loop.cc → tests/cefclient/browser/main_message_loop.cc
View File

@ -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 "cefclient/main_message_loop.h"
#include "cefclient/browser/main_message_loop.h"
#include "include/cef_task.h"
#include "include/wrapper/cef_closure_task.h"

7
tests/cefclient/main_message_loop.h → tests/cefclient/browser/main_message_loop.h
View File

@ -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.
#ifndef CEF_TESTS_CEFCLIENT_MAIN_MESSAGE_LOOP_H_
#define CEF_TESTS_CEFCLIENT_MAIN_MESSAGE_LOOP_H_
#ifndef CEF_TESTS_CEFCLIENT_BROWSER_MAIN_MESSAGE_LOOP_H_
#define CEF_TESTS_CEFCLIENT_BROWSER_MAIN_MESSAGE_LOOP_H_
#pragma once
#include "include/base/cef_bind.h"
#include "include/base/cef_scoped_ptr.h"
@ -104,4 +105,4 @@ struct DeleteOnMainThread {
} // namespace client
#endif // CEF_TESTS_CEFCLIENT_MAIN_MESSAGE_LOOP_H_
#endif // CEF_TESTS_CEFCLIENT_BROWSER_MAIN_MESSAGE_LOOP_H_

6
tests/cefclient/main_message_loop_multithreaded_win.cc → tests/cefclient/browser/main_message_loop_multithreaded_win.cc
View File

@ -2,12 +2,12 @@
// reserved. Use of this source code is governed by a BSD-style license that
// can be found in the LICENSE file.
#include "cefclient/main_message_loop_multithreaded_win.h"
#include "cefclient/browser/main_message_loop_multithreaded_win.h"
#include "include/base/cef_bind.h"
#include "include/cef_app.h"
#include "cefclient/resource.h"
#include "cefclient/util_win.h"
#include "cefclient/browser/resource.h"
#include "cefclient/browser/util_win.h"
namespace client {

9
tests/cefclient/main_message_loop_multithreaded_win.h → tests/cefclient/browser/main_message_loop_multithreaded_win.h
View File

@ -2,15 +2,16 @@
// reserved. Use of this source code is governed by a BSD-style license that
// can be found in the LICENSE file.
#ifndef CEF_TESTS_CEFCLIENT_MAIN_MESSAGE_LOOP_MULTITHREADED_WIN_H_
#define CEF_TESTS_CEFCLIENT_MAIN_MESSAGE_LOOP_MULTITHREADED_WIN_H_
#ifndef CEF_TESTS_CEFCLIENT_BROWSER_MAIN_MESSAGE_LOOP_MULTITHREADED_WIN_H_
#define CEF_TESTS_CEFCLIENT_BROWSER_MAIN_MESSAGE_LOOP_MULTITHREADED_WIN_H_
#pragma once
#include <windows.h>
#include <queue>
#include "include/base/cef_lock.h"
#include "include/base/cef_platform_thread.h"
#include "cefclient/main_message_loop.h"
#include "cefclient/browser/main_message_loop.h"
namespace client {
@ -57,4 +58,4 @@ class MainMessageLoopMultithreadedWin : public MainMessageLoop {
} // namespace client
#endif // CEF_TESTS_CEFCLIENT_MAIN_MESSAGE_LOOP_MULTITHREADED_WIN_H_
#endif // CEF_TESTS_CEFCLIENT_BROWSER_MAIN_MESSAGE_LOOP_MULTITHREADED_WIN_H_

2
tests/cefclient/main_message_loop_std.cc → tests/cefclient/browser/main_message_loop_std.cc
View File

@ -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 "cefclient/main_message_loop_std.h"
#include "cefclient/browser/main_message_loop_std.h"
#include "include/cef_app.h"

9
tests/cefclient/main_message_loop_std.h → tests/cefclient/browser/main_message_loop_std.h
View File

@ -2,10 +2,11 @@
// reserved. Use of this source code is governed by a BSD-style license that
// can be found in the LICENSE file.
#ifndef CEF_TESTS_CEFCLIENT_MAIN_MESSAGE_LOOP_STD_H_
#define CEF_TESTS_CEFCLIENT_MAIN_MESSAGE_LOOP_STD_H_
#ifndef CEF_TESTS_CEFCLIENT_BROWSER_MAIN_MESSAGE_LOOP_STD_H_
#define CEF_TESTS_CEFCLIENT_BROWSER_MAIN_MESSAGE_LOOP_STD_H_
#pragma once
#include "cefclient/main_message_loop.h"
#include "cefclient/browser/main_message_loop.h"
namespace client {
@ -31,4 +32,4 @@ class MainMessageLoopStd : public MainMessageLoop {
} // namespace client
#endif // CEF_TESTS_CEFCLIENT_MAIN_MESSAGE_LOOP_STD_H_
#endif // CEF_TESTS_CEFCLIENT_BROWSER_MAIN_MESSAGE_LOOP_STD_H_

9
tests/cefclient/osr_dragdrop_events.h → tests/cefclient/browser/osr_dragdrop_events.h
View File

@ -2,11 +2,12 @@
// reserved. Use of this source code is governed by a BSD-style license that
// can be found in the LICENSE file.
#ifndef CEF_TESTS_CEFCLIENT_OSR_DRAGDROP_EVENTS_H_
#define CEF_TESTS_CEFCLIENT_OSR_DRAGDROP_EVENTS_H_
#ifndef CEF_TESTS_CEFCLIENT_BROWSER_OSR_DRAGDROP_EVENTS_H_
#define CEF_TESTS_CEFCLIENT_BROWSER_OSR_DRAGDROP_EVENTS_H_
#pragma once
#include "include/cef_render_handler.h"
#include "cefclient/client_handler.h"
#include "cefclient/browser/client_handler.h"
namespace client {
@ -33,4 +34,4 @@ class OsrDragEvents {
} // namespace client
#endif // CEF_TESTS_CEFCLIENT_OSR_DRAGDROP_EVENTS_H_
#endif // CEF_TESTS_CEFCLIENT_BROWSER_OSR_DRAGDROP_EVENTS_H_

8
tests/cefclient/osr_dragdrop_win.cc → tests/cefclient/browser/osr_dragdrop_win.cc
View File

@ -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 "cefclient/osr_dragdrop_win.h"
#include "cefclient/browser/osr_dragdrop_win.h"
#if defined(CEF_USE_ATL)
@ -14,9 +14,9 @@
#include <string>
#include "include/wrapper/cef_helpers.h"
#include "cefclient/bytes_write_handler.h"
#include "cefclient/resource.h"
#include "cefclient/util_win.h"
#include "cefclient/browser/bytes_write_handler.h"
#include "cefclient/browser/resource.h"
#include "cefclient/browser/util_win.h"
namespace client {

9
tests/cefclient/osr_dragdrop_win.h → tests/cefclient/browser/osr_dragdrop_win.h
View File

@ -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.
#ifndef CEF_TESTS_CEFCLIENT_CEFCLIENT_OSR_DRAGDROP_WIN_H_
#define CEF_TESTS_CEFCLIENT_CEFCLIENT_OSR_DRAGDROP_WIN_H_
#ifndef CEF_TESTS_CEFCLIENT_BROWSER_OSR_DRAGDROP_WIN_H_
#define CEF_TESTS_CEFCLIENT_BROWSER_OSR_DRAGDROP_WIN_H_
#pragma once
// When generating projects with CMake the CEF_USE_ATL value will be defined
// automatically if using a supported Visual Studio version. Pass -DUSE_ATL=OFF
@ -17,7 +18,7 @@
#include <objidl.h>
#include <stdio.h>
#include "cefclient/osr_dragdrop_events.h"
#include "cefclient/browser/osr_dragdrop_events.h"
namespace client {
@ -188,4 +189,4 @@ class DataObjectWin : public IDataObject {
#endif // defined(CEF_USE_ATL)
#endif // CEF_TESTS_CEFCLIENT_CEFCLIENT_OSR_DRAGDROP_WIN_H_
#endif // CEF_TESTS_CEFCLIENT_BROWSER_OSR_DRAGDROP_WIN_H_

2
tests/cefclient/osr_renderer.cc → tests/cefclient/browser/osr_renderer.cc
View File

@ -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 "cefclient/osr_renderer.h"
#include "cefclient/browser/osr_renderer.h"
#if defined(OS_WIN)
#include <gl/gl.h>

10
tests/cefclient/osr_renderer.h → tests/cefclient/browser/osr_renderer.h
View File

@ -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.
#ifndef CEF_TESTS_CEFCLIENT_OSR_RENDERER_H_
#define CEF_TESTS_CEFCLIENT_OSR_RENDERER_H_
#ifndef CEF_TESTS_CEFCLIENT_BROWSER_OSR_RENDERER_H_
#define CEF_TESTS_CEFCLIENT_BROWSER_OSR_RENDERER_H_
#pragma once
#include "include/cef_browser.h"
@ -15,7 +15,7 @@ class OsrRenderer {
public:
OsrRenderer(bool transparent,
bool show_update_rect);
virtual ~OsrRenderer();
~OsrRenderer();
// Initialize the OpenGL environment.
void Initialize();
@ -64,9 +64,11 @@ class OsrRenderer {
float spin_x_;
float spin_y_;
CefRect update_rect_;
DISALLOW_COPY_AND_ASSIGN(OsrRenderer);
};
} // namespace client
#endif // CEF_TESTS_CEFCLIENT_OSR_RENDERER_H_
#endif // CEF_TESTS_CEFCLIENT_BROWSER_OSR_RENDERER_H_

8
tests/cefclient/osr_window_win.cc → tests/cefclient/browser/osr_window_win.cc
View File

@ -2,14 +2,14 @@
// reserved. Use of this source code is governed by a BSD-style license that
// can be found in the LICENSE file.
#include "cefclient/osr_window_win.h"
#include "cefclient/browser/osr_window_win.h"
#include <windowsx.h>
#include "include/base/cef_build.h"
#include "cefclient/main_message_loop.h"
#include "cefclient/resource.h"
#include "cefclient/util_win.h"
#include "cefclient/browser/main_message_loop.h"
#include "cefclient/browser/resource.h"
#include "cefclient/browser/util_win.h"
namespace client {

13
tests/cefclient/osr_window_win.h → tests/cefclient/browser/osr_window_win.h
View File

@ -2,16 +2,17 @@
// reserved. Use of this source code is governed by a BSD-style license that
// can be found in the LICENSE file.
#ifndef CEF_TESTS_CEFCLIENT_OSR_WINDOW_WIN_H_
#define CEF_TESTS_CEFCLIENT_OSR_WINDOW_WIN_H_
#ifndef CEF_TESTS_CEFCLIENT_BROWSER_OSR_WINDOW_WIN_H_
#define CEF_TESTS_CEFCLIENT_BROWSER_OSR_WINDOW_WIN_H_
#pragma once
#include "include/base/cef_bind.h"
#include "include/base/cef_ref_counted.h"
#include "include/wrapper/cef_closure_task.h"
#include "include/wrapper/cef_helpers.h"
#include "cefclient/client_handler_osr.h"
#include "cefclient/osr_dragdrop_win.h"
#include "cefclient/osr_renderer.h"
#include "cefclient/browser/client_handler_osr.h"
#include "cefclient/browser/osr_dragdrop_win.h"
#include "cefclient/browser/osr_renderer.h"
namespace client {
@ -182,4 +183,4 @@ class OsrWindowWin :
} // namespace client
#endif // CEF_TESTS_CEFCLIENT_OSR_WINDOW_WIN_H_
#endif // CEF_TESTS_CEFCLIENT_BROWSER_OSR_WINDOW_WIN_H_

2
tests/cefclient/print_handler_gtk.cc → tests/cefclient/browser/print_handler_gtk.cc
View File

@ -3,7 +3,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "cefclient/print_handler_gtk.h"
#include "cefclient/browser/print_handler_gtk.h"
#include <vector>

6
tests/cefclient/print_handler_gtk.h → tests/cefclient/browser/print_handler_gtk.h
View File

@ -3,8 +3,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef CEF_TESTS_CEFCLIENT_PRINT_HANDLER_GTK_H_
#define CEF_TESTS_CEFCLIENT_PRINT_HANDLER_GTK_H_
#ifndef CEF_TESTS_CEFCLIENT_BROWSER_PRINT_HANDLER_GTK_H_
#define CEF_TESTS_CEFCLIENT_BROWSER_PRINT_HANDLER_GTK_H_
#pragma once
#include <gtk/gtk.h>
@ -63,4 +63,4 @@ class ClientPrintHandlerGtk : public CefPrintHandler {
} // namespace client
#endif // CEF_TESTS_CEFCLIENT_PRINT_HANDLER_GTK_H_
#endif // CEF_TESTS_CEFCLIENT_BROWSER_PRINT_HANDLER_GTK_H_

0
tests/cefclient/resource.h → tests/cefclient/browser/resource.h
View File

6
tests/cefclient/resource_util.h → tests/cefclient/browser/resource_util.h
View File

@ -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.
#ifndef CEF_TESTS_CEFCLIENT_RESOURCE_UTIL_H_
#define CEF_TESTS_CEFCLIENT_RESOURCE_UTIL_H_
#ifndef CEF_TESTS_CEFCLIENT_BROWSER_RESOURCE_UTIL_H_
#define CEF_TESTS_CEFCLIENT_BROWSER_RESOURCE_UTIL_H_
#pragma once
#include <string>
@ -24,4 +24,4 @@ CefRefPtr<CefStreamReader> GetBinaryResourceReader(const char* resource_name);
} // namespace client
#endif // CEF_TESTS_CEFCLIENT_RESOURCE_UTIL_H_
#endif // CEF_TESTS_CEFCLIENT_BROWSER_RESOURCE_UTIL_H_

3
tests/cefclient/resource_util_linux.cc → tests/cefclient/browser/resource_util_linux.cc
View File

@ -3,7 +3,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "cefclient/resource_util.h"
#include "cefclient/browser/resource_util.h"
#include <stdio.h>
#include <string.h>
#include <unistd.h>

2
tests/cefclient/resource_util_mac.mm → tests/cefclient/browser/resource_util_mac.mm
View File

@ -3,7 +3,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "cefclient/resource_util.h"
#include "cefclient/browser/resource_util.h"
#import <Foundation/Foundation.h>
#include <mach-o/dyld.h>

3
tests/cefclient/resource_util_posix.cc → tests/cefclient/browser/resource_util_posix.cc
View File

@ -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 "cefclient/resource_util.h"
#include "cefclient/browser/resource_util.h"
#include <stdio.h>
namespace client {

5
tests/cefclient/resource_util_win.cc → tests/cefclient/browser/resource_util_win.cc
View File

@ -2,11 +2,12 @@
// reserved. Use of this source code is governed by a BSD-style license that
// can be found in the LICENSE file.
#include "cefclient/resource_util.h"
#include "cefclient/browser/resource_util.h"
#include "include/base/cef_logging.h"
#include "include/cef_stream.h"
#include "include/wrapper/cef_byte_read_handler.h"
#include "cefclient/resource.h"
#include "cefclient/browser/resource.h"
namespace client {

6
tests/cefclient/root_window.cc → tests/cefclient/browser/root_window.cc
View File

@ -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 "cefclient/root_window.h"
#include "cefclient/browser/root_window.h"
#include "cefclient/main_context.h"
#include "cefclient/root_window_manager.h"
#include "cefclient/browser/main_context.h"
#include "cefclient/browser/root_window_manager.h"
namespace client {

11
tests/cefclient/root_window.h → tests/cefclient/browser/root_window.h
View File

@ -2,15 +2,16 @@
// reserved. Use of this source code is governed by a BSD-style license that
// can be found in the LICENSE file.
#ifndef CEF_TESTS_CEFCLIENT_ROOT_WINDOW_H_
#define CEF_TESTS_CEFCLIENT_ROOT_WINDOW_H_
#ifndef CEF_TESTS_CEFCLIENT_BROWSER_ROOT_WINDOW_H_
#define CEF_TESTS_CEFCLIENT_BROWSER_ROOT_WINDOW_H_
#pragma once
#include <string>
#include "include/base/cef_ref_counted.h"
#include "include/cef_browser.h"
#include "cefclient/client_types.h"
#include "cefclient/main_message_loop.h"
#include "cefclient/browser/client_types.h"
#include "cefclient/browser/main_message_loop.h"
namespace client {
@ -113,4 +114,4 @@ class RootWindow :
} // namespace client
#endif // CEF_TESTS_CEFCLIENT_ROOT_WINDOW_H_
#endif // CEF_TESTS_CEFCLIENT_BROWSER_ROOT_WINDOW_H_

14
tests/cefclient/root_window_gtk.cc → tests/cefclient/browser/root_window_gtk.cc
View File

@ -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 "cefclient/root_window_gtk.h"
#include "cefclient/browser/root_window_gtk.h"
#include <gdk/gdk.h>
#include <gdk/gdkx.h>
@ -13,12 +13,12 @@
#include "include/base/cef_bind.h"
#include "include/cef_app.h"
#include "cefclient/browser_window_osr_gtk.h"
#include "cefclient/browser_window_std_gtk.h"
#include "cefclient/client_switches.h"
#include "cefclient/main_message_loop.h"
#include "cefclient/resource.h"
#include "cefclient/temp_window.h"
#include "cefclient/browser/browser_window_osr_gtk.h"
#include "cefclient/browser/browser_window_std_gtk.h"
#include "cefclient/browser/main_message_loop.h"
#include "cefclient/browser/resource.h"
#include "cefclient/browser/temp_window.h"
#include "cefclient/common/client_switches.h"
namespace client {

11
tests/cefclient/root_window_gtk.h → tests/cefclient/browser/root_window_gtk.h
View File

@ -2,15 +2,16 @@
// reserved. Use of this source code is governed by a BSD-style license that
// can be found in the LICENSE file.
#ifndef CEF_TESTS_CEFCLIENT_ROOT_WINDOW_GTK_H_
#define CEF_TESTS_CEFCLIENT_ROOT_WINDOW_GTK_H_
#ifndef CEF_TESTS_CEFCLIENT_BROWSER_ROOT_WINDOW_GTK_H_
#define CEF_TESTS_CEFCLIENT_BROWSER_ROOT_WINDOW_GTK_H_
#pragma once
#include <gtk/gtk.h>
#include <string>
#include "include/base/cef_scoped_ptr.h"
#include "cefclient/browser_window.h"
#include "cefclient/root_window.h"
#include "cefclient/browser/browser_window.h"
#include "cefclient/browser/root_window.h"
namespace client {
@ -148,4 +149,4 @@ class RootWindowGtk : public RootWindow,
} // namespace client
#endif // CEF_TESTS_CEFCLIENT_ROOT_WINDOW_GTK_H_
#endif // CEF_TESTS_CEFCLIENT_BROWSER_ROOT_WINDOW_GTK_H_

11
tests/cefclient/root_window_mac.h → tests/cefclient/browser/root_window_mac.h
View File

@ -2,15 +2,16 @@
// reserved. Use of this source code is governed by a BSD-style license that
// can be found in the LICENSE file.
#ifndef CEF_TESTS_CEFCLIENT_ROOT_WINDOW_MAC_H_
#define CEF_TESTS_CEFCLIENT_ROOT_WINDOW_MAC_H_
#ifndef CEF_TESTS_CEFCLIENT_BROWSER_ROOT_WINDOW_MAC_H_
#define CEF_TESTS_CEFCLIENT_BROWSER_ROOT_WINDOW_MAC_H_
#pragma once
#include <Cocoa/Cocoa.h>
#include <string>
#include "include/base/cef_scoped_ptr.h"
#include "cefclient/browser_window.h"
#include "cefclient/root_window.h"
#include "cefclient/browser/browser_window.h"
#include "cefclient/browser/root_window.h"
namespace client {
@ -96,4 +97,4 @@ class RootWindowMac : public RootWindow,
} // namespace client
#endif // CEF_TESTS_CEFCLIENT_ROOT_WINDOW_MAC_H_
#endif // CEF_TESTS_CEFCLIENT_BROWSER_ROOT_WINDOW_MAC_H_

12
tests/cefclient/root_window_mac.mm → tests/cefclient/browser/root_window_mac.mm
View File

@ -2,16 +2,16 @@
// reserved. Use of this source code is governed by a BSD-style license that
// can be found in the LICENSE file.
#include "cefclient/root_window_mac.h"
#include "cefclient/browser/root_window_mac.h"
#include "include/base/cef_bind.h"
#include "include/cef_app.h"
#include "include/cef_application_mac.h"
#include "cefclient/browser_window_osr_mac.h"
#include "cefclient/browser_window_std_mac.h"
#include "cefclient/client_switches.h"
#include "cefclient/main_message_loop.h"
#include "cefclient/temp_window.h"
#include "cefclient/browser/browser_window_osr_mac.h"
#include "cefclient/browser/browser_window_std_mac.h"
#include "cefclient/browser/main_message_loop.h"
#include "cefclient/browser/temp_window.h"
#include "cefclient/common/client_switches.h"
// Receives notifications from controls and the browser window. Will delete
// itself when done.

6
tests/cefclient/root_window_manager.cc → tests/cefclient/browser/root_window_manager.cc
View File

@ -2,12 +2,12 @@
// reserved. Use of this source code is governed by a BSD-style license that
// can be found in the LICENSE file.
#include "cefclient/root_window_manager.h"
#include "cefclient/browser/root_window_manager.h"
#include "include/base/cef_bind.h"
#include "include/wrapper/cef_helpers.h"
#include "cefclient/main_context.h"
#include "cefclient/test_runner.h"
#include "cefclient/browser/main_context.h"
#include "cefclient/browser/test_runner.h"
namespace client {

11
tests/cefclient/root_window_manager.h → tests/cefclient/browser/root_window_manager.h
View File

@ -2,15 +2,16 @@
// reserved. Use of this source code is governed by a BSD-style license that
// can be found in the LICENSE file.
#ifndef CEF_TESTS_CEFCLIENT_ROOT_WINDOW_MANAGER_H_
#define CEF_TESTS_CEFCLIENT_ROOT_WINDOW_MANAGER_H_
#ifndef CEF_TESTS_CEFCLIENT_BROWSER_ROOT_WINDOW_MANAGER_H_
#define CEF_TESTS_CEFCLIENT_BROWSER_ROOT_WINDOW_MANAGER_H_
#pragma once
#include <set>
#include "include/base/cef_scoped_ptr.h"
#include "include/cef_command_line.h"
#include "cefclient/root_window.h"
#include "cefclient/temp_window.h"
#include "cefclient/browser/root_window.h"
#include "cefclient/browser/temp_window.h"
namespace client {
@ -81,4 +82,4 @@ class RootWindowManager : public RootWindow::Delegate {
} // namespace client
#endif // CEF_TESTS_CEFCLIENT_ROOT_WINDOW_MANAGER_H_
#endif // CEF_TESTS_CEFCLIENT_BROWSER_ROOT_WINDOW_MANAGER_H_

18
tests/cefclient/root_window_win.cc → tests/cefclient/browser/root_window_win.cc
View File

@ -2,17 +2,17 @@
// reserved. Use of this source code is governed by a BSD-style license that
// can be found in the LICENSE file.
#include "cefclient/root_window_win.h"
#include "cefclient/browser/root_window_win.h"
#include "include/base/cef_bind.h"
#include "include/cef_app.h"
#include "cefclient/browser_window_osr_win.h"
#include "cefclient/browser_window_std_win.h"
#include "cefclient/client_switches.h"
#include "cefclient/main_message_loop.h"
#include "cefclient/resource.h"
#include "cefclient/temp_window.h"
#include "cefclient/util_win.h"
#include "cefclient/browser/browser_window_osr_win.h"
#include "cefclient/browser/browser_window_std_win.h"
#include "cefclient/browser/main_message_loop.h"
#include "cefclient/browser/resource.h"
#include "cefclient/browser/temp_window.h"
#include "cefclient/browser/util_win.h"
#include "cefclient/common/client_switches.h"
#define MAX_URL_LENGTH 255
#define BUTTON_WIDTH 72
@ -59,11 +59,11 @@ RootWindowWin::RootWindowWin()
find_message_id_(0),
find_wndproc_old_(NULL),
find_state_(),
find_buff_(),
find_next_(false),
find_match_case_last_(false),
window_destroyed_(false),
browser_destroyed_(false) {
find_buff_[0] = 0;
}
RootWindowWin::~RootWindowWin() {

11
tests/cefclient/root_window_win.h → tests/cefclient/browser/root_window_win.h
View File

@ -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.
#ifndef CEF_TESTS_CEFCLIENT_ROOT_WINDOW_WIN_H_
#define CEF_TESTS_CEFCLIENT_ROOT_WINDOW_WIN_H_
#ifndef CEF_TESTS_CEFCLIENT_BROWSER_ROOT_WINDOW_WIN_H_
#define CEF_TESTS_CEFCLIENT_BROWSER_ROOT_WINDOW_WIN_H_
#pragma once
#include <windows.h>
#include <commdlg.h>
@ -11,8 +12,8 @@
#include <string>
#include "include/base/cef_scoped_ptr.h"
#include "cefclient/browser_window.h"
#include "cefclient/root_window.h"
#include "cefclient/browser/browser_window.h"
#include "cefclient/browser/root_window.h"
namespace client {
@ -132,4 +133,4 @@ class RootWindowWin : public RootWindow,
} // namespace client
#endif // CEF_TESTS_CEFCLIENT_ROOT_WINDOW_WIN_H_
#endif // CEF_TESTS_CEFCLIENT_BROWSER_ROOT_WINDOW_WIN_H_

6
tests/cefclient/scheme_test.cc → tests/cefclient/browser/scheme_test.cc
View File

@ -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 "cefclient/scheme_test.h"
#include "cefclient/browser/scheme_test.h"
#include <algorithm>
#include <string>
@ -15,8 +15,8 @@
#include "include/cef_request.h"
#include "include/cef_scheme.h"
#include "include/wrapper/cef_helpers.h"
#include "cefclient/resource_util.h"
#include "cefclient/test_runner.h"
#include "cefclient/browser/resource_util.h"
#include "cefclient/browser/test_runner.h"
namespace client {
namespace scheme_test {

18
tests/cefclient/browser/scheme_test.h Normal file
View File

@ -0,0 +1,18 @@
// Copyright (c) 2009 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.
#ifndef CEF_TESTS_CEFCLIENT_BROWSER_SCHEME_TEST_H_
#define CEF_TESTS_CEFCLIENT_BROWSER_SCHEME_TEST_H_
#pragma once
namespace client {
namespace scheme_test {
// Create the scheme handler. Called from both the browser and renderer process.
void RegisterSchemeHandlers();
} // namespace scheme_test
} // namespace client
#endif // CEF_TESTS_CEFCLIENT_BROWSER_SCHEME_TEST_H_

15
tests/cefclient/temp_window.h → tests/cefclient/browser/temp_window.h
View File

@ -2,17 +2,18 @@
// reserved. Use of this source code is governed by a BSD-style license that
// can be found in the LICENSE file.
#ifndef CEF_TESTS_CEFCLIENT_TEMP_WINDOW_H_
#define CEF_TESTS_CEFCLIENT_TEMP_WINDOW_H_
#ifndef CEF_TESTS_CEFCLIENT_BROWSER_TEMP_WINDOW_H_
#define CEF_TESTS_CEFCLIENT_BROWSER_TEMP_WINDOW_H_
#pragma once
#include "cefclient/client_types.h"
#include "cefclient/browser/client_types.h"
#if defined(OS_WIN)
#include "cefclient/temp_window_win.h"
#include "cefclient/browser/temp_window_win.h"
#elif defined(OS_LINUX)
#include "cefclient/temp_window_x11.h"
#include "cefclient/browser/temp_window_x11.h"
#elif defined(OS_MACOSX)
#include "cefclient/temp_window_mac.h"
#include "cefclient/browser/temp_window_mac.h"
#endif
namespace client {
@ -27,4 +28,4 @@ typedef TempWindowMac TempWindow;
} // namespace client
#endif // CEF_TESTS_CEFCLIENT_TEMP_WINDOW_H_
#endif // CEF_TESTS_CEFCLIENT_BROWSER_TEMP_WINDOW_H_

9
tests/cefclient/temp_window_mac.h → tests/cefclient/browser/temp_window_mac.h
View File

@ -2,10 +2,11 @@
// reserved. Use of this source code is governed by a BSD-style license that
// can be found in the LICENSE file.
#ifndef CEF_TESTS_CEFCLIENT_TEMP_WINDOW_MAC_H_
#define CEF_TESTS_CEFCLIENT_TEMP_WINDOW_MAC_H_
#ifndef CEF_TESTS_CEFCLIENT_BROWSER_TEMP_WINDOW_MAC_H_
#define CEF_TESTS_CEFCLIENT_BROWSER_TEMP_WINDOW_MAC_H_
#pragma once
#include "cefclient/client_types.h"
#include "cefclient/browser/client_types.h"
namespace client {
@ -30,4 +31,4 @@ class TempWindowMac {
} // namespace client
#endif // CEF_TESTS_CEFCLIENT_TEMP_WINDOW_MAC_H_
#endif // CEF_TESTS_CEFCLIENT_BROWSER_TEMP_WINDOW_MAC_H_

2
tests/cefclient/temp_window_mac.mm → tests/cefclient/browser/temp_window_mac.mm
View File

@ -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 "cefclient/temp_window_mac.h"
#include "cefclient/browser/temp_window_mac.h"
#include <Cocoa/Cocoa.h>

2
tests/cefclient/temp_window_win.cc → tests/cefclient/browser/temp_window_win.cc
View File

@ -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 "cefclient/temp_window_win.h"
#include "cefclient/browser/temp_window_win.h"
#include <windows.h>

7
tests/cefclient/temp_window_win.h → tests/cefclient/browser/temp_window_win.h
View File

@ -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.
#ifndef CEF_TESTS_CEFCLIENT_TEMP_WINDOW_WIN_H_
#define CEF_TESTS_CEFCLIENT_TEMP_WINDOW_WIN_H_
#ifndef CEF_TESTS_CEFCLIENT_BROWSER_TEMP_WINDOW_WIN_H_
#define CEF_TESTS_CEFCLIENT_BROWSER_TEMP_WINDOW_WIN_H_
#pragma once
#include "include/cef_base.h"
@ -30,4 +31,4 @@ class TempWindowWin {
} // namespace client
#endif // CEF_TESTS_CEFCLIENT_TEMP_WINDOW_WIN_H_
#endif // CEF_TESTS_CEFCLIENT_BROWSER_TEMP_WINDOW_WIN_H_

2
tests/cefclient/temp_window_x11.cc → tests/cefclient/browser/temp_window_x11.cc
View File

@ -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 "cefclient/temp_window_x11.h"
#include "cefclient/browser/temp_window_x11.h"
#include <X11/Xlib.h>

7
tests/cefclient/temp_window_x11.h → tests/cefclient/browser/temp_window_x11.h
View File

@ -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.
#ifndef CEF_TESTS_CEFCLIENT_TEMP_WINDOW_X11_H_
#define CEF_TESTS_CEFCLIENT_TEMP_WINDOW_X11_H_
#ifndef CEF_TESTS_CEFCLIENT_BROWSER_TEMP_WINDOW_X11_H_
#define CEF_TESTS_CEFCLIENT_BROWSER_TEMP_WINDOW_X11_H_
#pragma once
#include "include/cef_base.h"
@ -30,4 +31,4 @@ class TempWindowX11 {
} // namespace client
#endif // CEF_TESTS_CEFCLIENT_TEMP_WINDOW_X11_H_
#endif // CEF_TESTS_CEFCLIENT_BROWSER_TEMP_WINDOW_X11_H_

16
tests/cefclient/test_runner.cc → tests/cefclient/browser/test_runner.cc
View File

@ -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 "cefclient/test_runner.h"
#include "cefclient/browser/test_runner.h"
#include "include/base/cef_bind.h"
#include "include/cef_task.h"
@ -11,13 +11,13 @@
#include "include/cef_web_plugin.h"
#include "include/wrapper/cef_closure_task.h"
#include "include/wrapper/cef_stream_resource_handler.h"
#include "cefclient/binding_test.h"
#include "cefclient/dialog_test.h"
#include "cefclient/main_context.h"
#include "cefclient/resource.h"
#include "cefclient/resource_util.h"
#include "cefclient/scheme_test.h"
#include "cefclient/window_test.h"
#include "cefclient/browser/binding_test.h"
#include "cefclient/browser/dialog_test.h"
#include "cefclient/browser/main_context.h"
#include "cefclient/browser/resource.h"
#include "cefclient/browser/resource_util.h"
#include "cefclient/browser/scheme_test.h"
#include "cefclient/browser/window_test.h"
namespace client {
namespace test_runner {

7
tests/cefclient/test_runner.h → tests/cefclient/browser/test_runner.h
View File

@ -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.
#ifndef CEF_TESTS_CEFCLIENT_TEST_RUNNER_H_
#define CEF_TESTS_CEFCLIENT_TEST_RUNNER_H_
#ifndef CEF_TESTS_CEFCLIENT_BROWSER_TEST_RUNNER_H_
#define CEF_TESTS_CEFCLIENT_BROWSER_TEST_RUNNER_H_
#pragma once
#include <set>
#include <string>
@ -42,4 +43,4 @@ void RegisterSchemeHandlers();
} // namespace test_runner
} // namespace client
#endif // CEF_TESTS_CEFCLIENT_TEST_RUNNER_H_
#endif // CEF_TESTS_CEFCLIENT_BROWSER_TEST_RUNNER_H_

2
tests/cefclient/util_win.cc → tests/cefclient/browser/util_win.cc
View File

@ -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 "cefclient/util_win.h"
#include "cefclient/browser/util_win.h"
#include "include/base/cef_logging.h"
#include "include/internal/cef_types.h"

6
tests/cefclient/util_win.h → tests/cefclient/browser/util_win.h
View File

@ -2,6 +2,10 @@
// reserved. Use of this source code is governed by a BSD-style license that
// can be found in the LICENSE file.
#ifndef CEF_TESTS_CEFCLIENT_BROWSER_UTIL_WIN_H_
#define CEF_TESTS_CEFCLIENT_BROWSER_UTIL_WIN_H_
#pragma once
#include <windows.h>
#include <string>
@ -27,3 +31,5 @@ int GetCefKeyboardModifiers(WPARAM wparam, LPARAM lparam);
bool IsKeyDown(WPARAM wparam);
} // namespace client
#endif // CEF_TESTS_CEFCLIENT_BROWSER_UTIL_WIN_H_

4
tests/cefclient/window_test.cc → tests/cefclient/browser/window_test.cc
View File

@ -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 "cefclient/window_test.h"
#include "cefclient/browser/window_test.h"
#include <algorithm>
#include <sstream>
@ -11,7 +11,7 @@
#include "include/base/cef_bind.h"
#include "include/wrapper/cef_stream_resource_handler.h"
#include "cefclient/main_message_loop.h"
#include "cefclient/browser/main_message_loop.h"
namespace client {
namespace window_test {

8
tests/cefclient/window_test.h → tests/cefclient/browser/window_test.h
View File

@ -2,11 +2,11 @@
// reserved. Use of this source code is governed by a BSD-style license that
// can be found in the LICENSE file.
#ifndef CEF_TESTS_CEFCLIENT_WINDOW_TEST_H_
#define CEF_TESTS_CEFCLIENT_WINDOW_TEST_H_
#ifndef CEF_TESTS_CEFCLIENT_BROWSER_WINDOW_TEST_H_
#define CEF_TESTS_CEFCLIENT_BROWSER_WINDOW_TEST_H_
#pragma once
#include "cefclient/test_runner.h"
#include "cefclient/browser/test_runner.h"
namespace client {
namespace window_test {
@ -28,4 +28,4 @@ void Restore(CefRefPtr<CefBrowser> browser);
} // namespace window_test
} // namespace client
#endif // CEF_TESTS_CEFCLIENT_WINDOW_TEST_H_
#endif // CEF_TESTS_CEFCLIENT_BROWSER_WINDOW_TEST_H_

4
tests/cefclient/window_test_gtk.cc → tests/cefclient/browser/window_test_gtk.cc
View File

@ -2,11 +2,11 @@
// reserved. Use of this source code is governed by a BSD-style license that
// can be found in the LICENSE file.
#include "cefclient/window_test.h"
#include "cefclient/browser/window_test.h"
#include <gtk/gtk.h>
#include "cefclient/root_window.h"
#include "cefclient/browser/root_window.h"
namespace client {
namespace window_test {

2
tests/cefclient/window_test_mac.mm → tests/cefclient/browser/window_test_mac.mm
View File

@ -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 "cefclient/window_test.h"
#include "cefclient/browser/window_test.h"
#import <Cocoa/Cocoa.h>

2
tests/cefclient/window_test_win.cc → tests/cefclient/browser/window_test_win.cc
View File

@ -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 "cefclient/window_test.h"
#include "cefclient/browser/window_test.h"
namespace client {
namespace window_test {

42
tests/cefclient/client_app_delegates.cc
View File

@ -1,42 +0,0 @@
// Copyright (c) 2012 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/client_app.h"
#include "cefclient/client_renderer.h"
#include "cefclient/performance_test.h"
#include "cefclient/scheme_test.h"
#if defined(OS_LINUX)
#include "cefclient/print_handler_gtk.h"
#endif
namespace client {
// static
void ClientApp::CreateBrowserDelegates(BrowserDelegateSet& delegates) {
}
// static
void ClientApp::CreateRenderDelegates(RenderDelegateSet& delegates) {
renderer::CreateRenderDelegates(delegates);
performance_test::CreateRenderDelegates(delegates);
}
// static
void ClientApp::RegisterCustomSchemes(
CefRefPtr<CefSchemeRegistrar> registrar,
std::vector<CefString>& cookiable_schemes) {
scheme_test::RegisterCustomSchemes(registrar, cookiable_schemes);
}
// static
CefRefPtr<CefPrintHandler> ClientApp::CreatePrintHandler() {
#if defined(OS_LINUX)
return new ClientPrintHandlerGtk();
#else
return NULL;
#endif
}
} // namespace client

0
tests/cefclient/client_app.cc → tests/cefclient/common/client_app.cc
View File

6
tests/cefclient/client_app.h → tests/cefclient/common/client_app.h
View File

@ -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.
#ifndef CEF_TESTS_CEFCLIENT_CLIENT_APP_H_
#define CEF_TESTS_CEFCLIENT_CLIENT_APP_H_
#ifndef CEF_TESTS_CEFCLIENT_COMMON_CLIENT_APP_H_
#define CEF_TESTS_CEFCLIENT_COMMON_CLIENT_APP_H_
#pragma once
#include <map>
@ -188,4 +188,4 @@ class ClientApp : public CefApp,
} // namespace client
#endif // CEF_TESTS_CEFCLIENT_CLIENT_APP_H_
#endif // CEF_TESTS_CEFCLIENT_COMMON_CLIENT_APP_H_

17
tests/cefclient/common/client_app_delegates_common.cc Normal file
View File

@ -0,0 +1,17 @@
// Copyright (c) 2012 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/common/client_app.h"
#include "cefclient/common/scheme_test_common.h"
namespace client {
// static
void ClientApp::RegisterCustomSchemes(
CefRefPtr<CefSchemeRegistrar> registrar,
std::vector<CefString>& cookiable_schemes) {
scheme_test::RegisterCustomSchemes(registrar, cookiable_schemes);
}
} // namespace client

0
tests/cefclient/client_switches.cc → tests/cefclient/common/client_switches.cc
View File

6
tests/cefclient/client_switches.h → tests/cefclient/common/client_switches.h
View File

@ -4,8 +4,8 @@
// Defines all of the command line switches used by cefclient.
#ifndef CEF_TESTS_CEFCLIENT_CEFCLIENT_SWITCHES_H_
#define CEF_TESTS_CEFCLIENT_CEFCLIENT_SWITCHES_H_
#ifndef CEF_TESTS_CEFCLIENT_CEFCLIENT_COMMON_SWITCHES_H_
#define CEF_TESTS_CEFCLIENT_CEFCLIENT_COMMON_SWITCHES_H_
#pragma once
namespace client {
@ -23,4 +23,4 @@ extern const char kMouseCursorChangeDisabled[];
} // namespace switches
} // namespace client
#endif // CEF_TESTS_CEFCLIENT_CEFCLIENT_SWITCHES_H_
#endif // CEF_TESTS_CEFCLIENT_CEFCLIENT_COMMON_SWITCHES_H_

2
tests/cefclient/scheme_test_common.cc → tests/cefclient/common/scheme_test_common.cc
View File

@ -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 "cefclient/scheme_test.h"
#include "cefclient/common/scheme_test_common.h"
#include "include/cef_scheme.h"

13
tests/cefclient/scheme_test.h → tests/cefclient/common/scheme_test_common.h
View File

@ -2,15 +2,13 @@
// reserved. Use of this source code is governed by a BSD-style license that
// can be found in the LICENSE file.
#ifndef CEF_TESTS_CEFCLIENT_SCHEME_TEST_H_
#define CEF_TESTS_CEFCLIENT_SCHEME_TEST_H_
#ifndef CEF_TESTS_CEFCLIENT_COMMON_SCHEME_TEST_COMMON_H_
#define CEF_TESTS_CEFCLIENT_COMMON_SCHEME_TEST_COMMON_H_
#pragma once
#include <vector>
#include "include/cef_base.h"
class CefBrowser;
class CefSchemeRegistrar;
#include "include/cef_scheme.h"
namespace client {
namespace scheme_test {
@ -19,10 +17,7 @@ namespace scheme_test {
void RegisterCustomSchemes(CefRefPtr<CefSchemeRegistrar> registrar,
std::vector<CefString>& cookiable_schemes);
// Create the scheme handler. Called from both the browser and renderer process.
void RegisterSchemeHandlers();
} // namespace scheme_test
} // namespace client
#endif // CEF_TESTS_CEFCLIENT_SCHEME_TEST_H_
#endif // CEF_TESTS_CEFCLIENT_COMMON_SCHEME_TEST_COMMON_H_

Some files were not shown because too many files have changed in this diff Show More