From 5c28259c31b771cd430d3fc7af4181637127bd2b Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Sat, 31 Jan 2015 00:55:56 +0000 Subject: [PATCH] cefclient: Organize source files into directories by target process (browser, renderer, common) (issue #1500). git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@2014 5089003a-bbd8-11dd-ad1f-f1f9622dbc98 --- cef.gyp | 37 ++- cef_paths2.gypi | 252 +++++++++--------- macros.cmake.in | 4 +- tests/cefclient/CMakeLists.txt.in | 14 +- tests/cefclient/{ => browser}/binding_test.cc | 2 +- tests/cefclient/{ => browser}/binding_test.h | 8 +- .../cefclient/{ => browser}/browser_window.cc | 4 +- .../cefclient/{ => browser}/browser_window.h | 12 +- .../{ => browser}/browser_window_osr_gtk.cc | 4 +- .../{ => browser}/browser_window_osr_gtk.h | 13 +- .../{ => browser}/browser_window_osr_mac.h | 13 +- .../{ => browser}/browser_window_osr_mac.mm | 6 +- .../{ => browser}/browser_window_osr_win.cc | 4 +- .../{ => browser}/browser_window_osr_win.h | 11 +- .../{ => browser}/browser_window_std_gtk.cc | 7 +- .../{ => browser}/browser_window_std_gtk.h | 9 +- .../{ => browser}/browser_window_std_mac.h | 9 +- .../{ => browser}/browser_window_std_mac.mm | 7 +- .../{ => browser}/browser_window_std_win.cc | 6 +- .../{ => browser}/browser_window_std_win.h | 9 +- .../{ => browser}/bytes_write_handler.cc | 2 +- .../{ => browser}/bytes_write_handler.h | 8 +- .../cefclient/{ => browser}/cefclient_gtk.cc | 8 +- .../cefclient/{ => browser}/cefclient_mac.mm | 23 +- .../cefclient/{ => browser}/cefclient_win.cc | 12 +- .../browser/client_app_delegates_browser.cc | 26 ++ .../cefclient/{ => browser}/client_handler.cc | 18 +- .../cefclient/{ => browser}/client_handler.h | 10 +- .../{ => browser}/client_handler_osr.cc | 2 +- .../{ => browser}/client_handler_osr.h | 9 +- .../{ => browser}/client_handler_std.cc | 2 +- .../{ => browser}/client_handler_std.h | 9 +- tests/cefclient/{ => browser}/client_types.h | 7 +- .../{ => browser}/dialog_handler_gtk.cc | 4 +- .../{ => browser}/dialog_handler_gtk.h | 6 +- tests/cefclient/{ => browser}/dialog_test.cc | 2 +- tests/cefclient/{ => browser}/dialog_test.h | 8 +- tests/cefclient/{ => browser}/main_context.cc | 2 +- tests/cefclient/{ => browser}/main_context.h | 10 +- .../{ => browser}/main_context_impl.cc | 4 +- .../{ => browser}/main_context_impl.h | 11 +- .../{ => browser}/main_context_impl_posix.cc | 2 +- .../{ => browser}/main_context_impl_win.cc | 4 +- .../{ => browser}/main_message_loop.cc | 2 +- .../{ => browser}/main_message_loop.h | 7 +- .../main_message_loop_multithreaded_win.cc | 6 +- .../main_message_loop_multithreaded_win.h | 9 +- .../{ => browser}/main_message_loop_std.cc | 2 +- .../{ => browser}/main_message_loop_std.h | 9 +- .../{ => browser}/osr_dragdrop_events.h | 9 +- .../{ => browser}/osr_dragdrop_win.cc | 8 +- .../{ => browser}/osr_dragdrop_win.h | 9 +- tests/cefclient/{ => browser}/osr_renderer.cc | 2 +- tests/cefclient/{ => browser}/osr_renderer.h | 10 +- .../cefclient/{ => browser}/osr_window_win.cc | 8 +- .../cefclient/{ => browser}/osr_window_win.h | 13 +- .../{ => browser}/print_handler_gtk.cc | 2 +- .../{ => browser}/print_handler_gtk.h | 6 +- tests/cefclient/{ => browser}/resource.h | 0 tests/cefclient/{ => browser}/resource_util.h | 6 +- .../{ => browser}/resource_util_linux.cc | 3 +- .../{ => browser}/resource_util_mac.mm | 2 +- .../{ => browser}/resource_util_posix.cc | 3 +- .../{ => browser}/resource_util_win.cc | 5 +- tests/cefclient/{ => browser}/root_window.cc | 6 +- tests/cefclient/{ => browser}/root_window.h | 11 +- .../{ => browser}/root_window_gtk.cc | 14 +- .../cefclient/{ => browser}/root_window_gtk.h | 11 +- .../cefclient/{ => browser}/root_window_mac.h | 11 +- .../{ => browser}/root_window_mac.mm | 12 +- .../{ => browser}/root_window_manager.cc | 6 +- .../{ => browser}/root_window_manager.h | 11 +- .../{ => browser}/root_window_win.cc | 18 +- .../cefclient/{ => browser}/root_window_win.h | 11 +- tests/cefclient/{ => browser}/scheme_test.cc | 6 +- tests/cefclient/browser/scheme_test.h | 18 ++ tests/cefclient/{ => browser}/temp_window.h | 15 +- .../cefclient/{ => browser}/temp_window_mac.h | 9 +- .../{ => browser}/temp_window_mac.mm | 2 +- .../{ => browser}/temp_window_win.cc | 2 +- .../cefclient/{ => browser}/temp_window_win.h | 7 +- .../{ => browser}/temp_window_x11.cc | 2 +- .../cefclient/{ => browser}/temp_window_x11.h | 7 +- tests/cefclient/{ => browser}/test_runner.cc | 16 +- tests/cefclient/{ => browser}/test_runner.h | 7 +- tests/cefclient/{ => browser}/util_win.cc | 2 +- tests/cefclient/{ => browser}/util_win.h | 6 + tests/cefclient/{ => browser}/window_test.cc | 4 +- tests/cefclient/{ => browser}/window_test.h | 8 +- .../{ => browser}/window_test_gtk.cc | 4 +- .../{ => browser}/window_test_mac.mm | 2 +- .../{ => browser}/window_test_win.cc | 2 +- tests/cefclient/client_app_delegates.cc | 42 --- tests/cefclient/{ => common}/client_app.cc | 0 tests/cefclient/{ => common}/client_app.h | 6 +- .../common/client_app_delegates_common.cc | 17 ++ .../cefclient/{ => common}/client_switches.cc | 0 .../cefclient/{ => common}/client_switches.h | 6 +- .../{ => common}/scheme_test_common.cc | 2 +- .../scheme_test_common.h} | 13 +- .../renderer/client_app_delegates_renderer.cc | 17 ++ .../client_app_delegates_stubs_mac.cc | 21 ++ .../{ => renderer}/client_renderer.cc | 7 +- .../{ => renderer}/client_renderer.h | 11 +- .../{ => renderer}/performance_test.cc | 4 +- .../{ => renderer}/performance_test.h | 8 +- .../{ => renderer}/performance_test_setup.h | 6 +- .../{ => renderer}/performance_test_tests.cc | 4 +- .../{ => renderer}/process_helper_mac.cc | 2 +- .../win}/cefclient.exe.manifest | 0 .../{ => resources/win}/cefclient.rc | 65 ++++- tests/cefsimple/CMakeLists.txt.in | 2 +- tests/unittests/client_app_delegates.cc | 2 +- tests/unittests/dom_unittest.cc | 2 +- tests/unittests/frame_unittest.cc | 2 +- tests/unittests/message_router_unittest.cc | 2 +- tests/unittests/navigation_unittest.cc | 2 +- tests/unittests/os_rendering_unittest.cc | 4 +- tests/unittests/process_message_unittest.cc | 2 +- tests/unittests/request_handler_unittest.cc | 2 +- tests/unittests/request_unittest.cc | 2 +- tests/unittests/routing_test_handler.cc | 2 +- tests/unittests/run_all_unittests.cc | 2 +- tests/unittests/test_suite.cc | 2 +- tests/unittests/urlrequest_unittest.cc | 2 +- tests/unittests/v8_unittest.cc | 2 +- tools/distrib/win/transfer.cfg | 2 +- tools/make_distrib.py | 6 +- 128 files changed, 695 insertions(+), 547 deletions(-) rename tests/cefclient/{ => browser}/binding_test.cc (97%) rename tests/cefclient/{ => browser}/binding_test.h (66%) rename tests/cefclient/{ => browser}/browser_window.cc (94%) rename tests/cefclient/{ => browser}/browser_window.h (93%) rename tests/cefclient/{ => browser}/browser_window_osr_gtk.cc (99%) rename tests/cefclient/{ => browser}/browser_window_osr_gtk.h (93%) rename tests/cefclient/{ => browser}/browser_window_osr_mac.h (91%) rename tests/cefclient/{ => browser}/browser_window_osr_mac.mm (99%) rename tests/cefclient/{ => browser}/browser_window_osr_win.cc (96%) rename tests/cefclient/{ => browser}/browser_window_osr_win.h (86%) rename tests/cefclient/{ => browser}/browser_window_std_gtk.cc (97%) rename tests/cefclient/{ => browser}/browser_window_std_gtk.h (85%) rename tests/cefclient/{ => browser}/browser_window_std_mac.h (85%) rename tests/cefclient/{ => browser}/browser_window_std_mac.mm (94%) rename tests/cefclient/{ => browser}/browser_window_std_win.cc (95%) rename tests/cefclient/{ => browser}/browser_window_std_win.h (85%) rename tests/cefclient/{ => browser}/bytes_write_handler.cc (97%) rename tests/cefclient/{ => browser}/bytes_write_handler.h (83%) rename tests/cefclient/{ => browser}/cefclient_gtk.cc (95%) rename tests/cefclient/{ => browser}/cefclient_mac.mm (94%) rename tests/cefclient/{ => browser}/cefclient_win.cc (91%) create mode 100644 tests/cefclient/browser/client_app_delegates_browser.cc rename tests/cefclient/{ => browser}/client_handler.cc (97%) rename tests/cefclient/{ => browser}/client_handler.h (97%) rename tests/cefclient/{ => browser}/client_handler_osr.cc (98%) rename tests/cefclient/{ => browser}/client_handler_osr.h (95%) rename tests/cefclient/{ => browser}/client_handler_std.cc (89%) rename tests/cefclient/{ => browser}/client_handler_std.h (73%) rename tests/cefclient/{ => browser}/client_types.h (80%) rename tests/cefclient/{ => browser}/dialog_handler_gtk.cc (99%) rename tests/cefclient/{ => browser}/dialog_handler_gtk.h (91%) rename tests/cefclient/{ => browser}/dialog_test.cc (99%) rename tests/cefclient/{ => browser}/dialog_test.h (66%) rename tests/cefclient/{ => browser}/main_context.cc (92%) rename tests/cefclient/{ => browser}/main_context.h (88%) rename tests/cefclient/{ => browser}/main_context_impl.cc (97%) rename tests/cefclient/{ => browser}/main_context_impl.h (89%) rename tests/cefclient/{ => browser}/main_context_impl_posix.cc (93%) rename tests/cefclient/{ => browser}/main_context_impl_win.cc (92%) rename tests/cefclient/{ => browser}/main_message_loop.cc (94%) rename tests/cefclient/{ => browser}/main_message_loop.h (94%) rename tests/cefclient/{ => browser}/main_message_loop_multithreaded_win.cc (96%) rename tests/cefclient/{ => browser}/main_message_loop_multithreaded_win.h (85%) rename tests/cefclient/{ => browser}/main_message_loop_std.cc (94%) rename tests/cefclient/{ => browser}/main_message_loop_std.h (76%) rename tests/cefclient/{ => browser}/osr_dragdrop_events.h (77%) rename tests/cefclient/{ => browser}/osr_dragdrop_win.cc (99%) rename tests/cefclient/{ => browser}/osr_dragdrop_win.h (95%) rename tests/cefclient/{ => browser}/osr_renderer.cc (99%) rename tests/cefclient/{ => browser}/osr_renderer.h (89%) rename tests/cefclient/{ => browser}/osr_window_win.cc (99%) rename tests/cefclient/{ => browser}/osr_window_win.h (94%) rename tests/cefclient/{ => browser}/print_handler_gtk.cc (99%) rename tests/cefclient/{ => browser}/print_handler_gtk.h (92%) rename tests/cefclient/{ => browser}/resource.h (100%) rename tests/cefclient/{ => browser}/resource_util.h (80%) rename tests/cefclient/{ => browser}/resource_util_linux.cc (94%) rename tests/cefclient/{ => browser}/resource_util_mac.mm (97%) rename tests/cefclient/{ => browser}/resource_util_posix.cc (96%) rename tests/cefclient/{ => browser}/resource_util_win.cc (96%) rename tests/cefclient/{ => browser}/root_window.cc (74%) rename tests/cefclient/{ => browser}/root_window.h (93%) rename tests/cefclient/{ => browser}/root_window_gtk.cc (98%) rename tests/cefclient/{ => browser}/root_window_gtk.h (95%) rename tests/cefclient/{ => browser}/root_window_mac.h (91%) rename tests/cefclient/{ => browser}/root_window_mac.mm (98%) rename tests/cefclient/{ => browser}/root_window_manager.cc (96%) rename tests/cefclient/{ => browser}/root_window_manager.h (91%) rename tests/cefclient/{ => browser}/root_window_win.cc (98%) rename tests/cefclient/{ => browser}/root_window_win.h (93%) rename tests/cefclient/{ => browser}/scheme_test.cc (97%) create mode 100644 tests/cefclient/browser/scheme_test.h rename tests/cefclient/{ => browser}/temp_window.h (58%) rename tests/cefclient/{ => browser}/temp_window_mac.h (74%) rename tests/cefclient/{ => browser}/temp_window_mac.mm (95%) rename tests/cefclient/{ => browser}/temp_window_win.cc (96%) rename tests/cefclient/{ => browser}/temp_window_win.h (79%) rename tests/cefclient/{ => browser}/temp_window_x11.cc (96%) rename tests/cefclient/{ => browser}/temp_window_x11.h (79%) rename tests/cefclient/{ => browser}/test_runner.cc (97%) rename tests/cefclient/{ => browser}/test_runner.h (88%) rename tests/cefclient/{ => browser}/util_win.cc (98%) rename tests/cefclient/{ => browser}/util_win.h (84%) rename tests/cefclient/{ => browser}/window_test.cc (97%) rename tests/cefclient/{ => browser}/window_test.h (80%) rename tests/cefclient/{ => browser}/window_test_gtk.cc (96%) rename tests/cefclient/{ => browser}/window_test_mac.mm (97%) rename tests/cefclient/{ => browser}/window_test_win.cc (98%) delete mode 100644 tests/cefclient/client_app_delegates.cc rename tests/cefclient/{ => common}/client_app.cc (100%) rename tests/cefclient/{ => common}/client_app.h (98%) create mode 100644 tests/cefclient/common/client_app_delegates_common.cc rename tests/cefclient/{ => common}/client_switches.cc (100%) rename tests/cefclient/{ => common}/client_switches.h (79%) rename tests/cefclient/{ => common}/scheme_test_common.cc (91%) rename tests/cefclient/{scheme_test.h => common/scheme_test_common.h} (60%) create mode 100644 tests/cefclient/renderer/client_app_delegates_renderer.cc create mode 100644 tests/cefclient/renderer/client_app_delegates_stubs_mac.cc rename tests/cefclient/{ => renderer}/client_renderer.cc (96%) rename tests/cefclient/{ => renderer}/client_renderer.h (60%) rename tests/cefclient/{ => renderer}/performance_test.cc (97%) rename tests/cefclient/{ => renderer}/performance_test.h (67%) rename tests/cefclient/{ => renderer}/performance_test_setup.h (92%) rename tests/cefclient/{ => renderer}/performance_test_tests.cc (98%) rename tests/cefclient/{ => renderer}/process_helper_mac.cc (90%) rename tests/cefclient/{ => resources/win}/cefclient.exe.manifest (100%) rename tests/cefclient/{ => resources/win}/cefclient.rc (65%) diff --git a/cef.gyp b/cef.gyp index e0dc30998..46037c795 100644 --- a/cef.gyp +++ b/cef.gyp @@ -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', diff --git a/cef_paths2.gypi b/cef_paths2.gypi index 2b6c57476..6d8196643 100644 --- a/cef_paths2.gypi +++ b/cef_paths2.gypi @@ -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', diff --git a/macros.cmake.in b/macros.cmake.in index b5d74f0b5..8114c7706 100644 --- a/macros.cmake.in +++ b/macros.cmake.in @@ -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..." ) diff --git a/tests/cefclient/CMakeLists.txt.in b/tests/cefclient/CMakeLists.txt.in index c7e2c92c8..b7344f285 100644 --- a/tests/cefclient/CMakeLists.txt.in +++ b/tests/cefclient/CMakeLists.txt.in @@ -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}") diff --git a/tests/cefclient/binding_test.cc b/tests/cefclient/browser/binding_test.cc similarity index 97% rename from tests/cefclient/binding_test.cc rename to tests/cefclient/browser/binding_test.cc index 5dcebaabf..f02afc651 100644 --- a/tests/cefclient/binding_test.cc +++ b/tests/cefclient/browser/binding_test.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 "cefclient/binding_test.h" +#include "cefclient/browser/binding_test.h" #include #include diff --git a/tests/cefclient/binding_test.h b/tests/cefclient/browser/binding_test.h similarity index 66% rename from tests/cefclient/binding_test.h rename to tests/cefclient/browser/binding_test.h index d3a67c2b1..ab41bfcc6 100644 --- a/tests/cefclient/binding_test.h +++ b/tests/cefclient/browser/binding_test.h @@ -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_ diff --git a/tests/cefclient/browser_window.cc b/tests/cefclient/browser/browser_window.cc similarity index 94% rename from tests/cefclient/browser_window.cc rename to tests/cefclient/browser/browser_window.cc index b4077c2ab..e5efac2e8 100644 --- a/tests/cefclient/browser_window.cc +++ b/tests/cefclient/browser/browser_window.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 "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 { diff --git a/tests/cefclient/browser_window.h b/tests/cefclient/browser/browser_window.h similarity index 93% rename from tests/cefclient/browser_window.h rename to tests/cefclient/browser/browser_window.h index 16b78cef3..544c8f5bc 100644 --- a/tests/cefclient/browser_window.h +++ b/tests/cefclient/browser/browser_window.h @@ -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 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_ diff --git a/tests/cefclient/browser_window_osr_gtk.cc b/tests/cefclient/browser/browser_window_osr_gtk.cc similarity index 99% rename from tests/cefclient/browser_window_osr_gtk.cc rename to tests/cefclient/browser/browser_window_osr_gtk.cc index 905dbad54..d009390ae 100644 --- a/tests/cefclient/browser_window_osr_gtk.cc +++ b/tests/cefclient/browser/browser_window_osr_gtk.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 "cefclient/browser_window_osr_gtk.h" +#include "cefclient/browser/browser_window_osr_gtk.h" #include #include @@ -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 { diff --git a/tests/cefclient/browser_window_osr_gtk.h b/tests/cefclient/browser/browser_window_osr_gtk.h similarity index 93% rename from tests/cefclient/browser_window_osr_gtk.h rename to tests/cefclient/browser/browser_window_osr_gtk.h index fde002c6d..ffef6c118 100644 --- a/tests/cefclient/browser_window_osr_gtk.h +++ b/tests/cefclient/browser/browser_window_osr_gtk.h @@ -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_ diff --git a/tests/cefclient/browser_window_osr_mac.h b/tests/cefclient/browser/browser_window_osr_mac.h similarity index 91% rename from tests/cefclient/browser_window_osr_mac.h rename to tests/cefclient/browser/browser_window_osr_mac.h index 7e066ff98..7ef68d20a 100644 --- a/tests/cefclient/browser_window_osr_mac.h +++ b/tests/cefclient/browser/browser_window_osr_mac.h @@ -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_ diff --git a/tests/cefclient/browser_window_osr_mac.mm b/tests/cefclient/browser/browser_window_osr_mac.mm similarity index 99% rename from tests/cefclient/browser_window_osr_mac.mm rename to tests/cefclient/browser/browser_window_osr_mac.mm index dbfc90baa..94ad8da65 100644 --- a/tests/cefclient/browser_window_osr_mac.mm +++ b/tests/cefclient/browser/browser_window_osr_mac.mm @@ -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 #import @@ -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 { diff --git a/tests/cefclient/browser_window_osr_win.cc b/tests/cefclient/browser/browser_window_osr_win.cc similarity index 96% rename from tests/cefclient/browser_window_osr_win.cc rename to tests/cefclient/browser/browser_window_osr_win.cc index 9fc8b6ac6..255e650d8 100644 --- a/tests/cefclient/browser_window_osr_win.cc +++ b/tests/cefclient/browser/browser_window_osr_win.cc @@ -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 { diff --git a/tests/cefclient/browser_window_osr_win.h b/tests/cefclient/browser/browser_window_osr_win.h similarity index 86% rename from tests/cefclient/browser_window_osr_win.h rename to tests/cefclient/browser/browser_window_osr_win.h index 1a1aaa403..290e789a9 100644 --- a/tests/cefclient/browser_window_osr_win.h +++ b/tests/cefclient/browser/browser_window_osr_win.h @@ -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_ diff --git a/tests/cefclient/browser_window_std_gtk.cc b/tests/cefclient/browser/browser_window_std_gtk.cc similarity index 97% rename from tests/cefclient/browser_window_std_gtk.cc rename to tests/cefclient/browser/browser_window_std_gtk.cc index 7e2f3de92..ca895bb96 100644 --- a/tests/cefclient/browser_window_std_gtk.cc +++ b/tests/cefclient/browser/browser_window_std_gtk.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 "cefclient/browser_window_std_gtk.h" +#include "cefclient/browser/browser_window_std_gtk.h" #include #include @@ -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 { diff --git a/tests/cefclient/browser_window_std_gtk.h b/tests/cefclient/browser/browser_window_std_gtk.h similarity index 85% rename from tests/cefclient/browser_window_std_gtk.h rename to tests/cefclient/browser/browser_window_std_gtk.h index c78776848..93359424f 100644 --- a/tests/cefclient/browser_window_std_gtk.h +++ b/tests/cefclient/browser/browser_window_std_gtk.h @@ -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_ diff --git a/tests/cefclient/browser_window_std_mac.h b/tests/cefclient/browser/browser_window_std_mac.h similarity index 85% rename from tests/cefclient/browser_window_std_mac.h rename to tests/cefclient/browser/browser_window_std_mac.h index bba0de1a8..54e5ee0b7 100644 --- a/tests/cefclient/browser_window_std_mac.h +++ b/tests/cefclient/browser/browser_window_std_mac.h @@ -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_ diff --git a/tests/cefclient/browser_window_std_mac.mm b/tests/cefclient/browser/browser_window_std_mac.mm similarity index 94% rename from tests/cefclient/browser_window_std_mac.mm rename to tests/cefclient/browser/browser_window_std_mac.mm index c0c1a40bc..c061b55ad 100644 --- a/tests/cefclient/browser_window_std_mac.mm +++ b/tests/cefclient/browser/browser_window_std_mac.mm @@ -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 #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 { diff --git a/tests/cefclient/browser_window_std_win.cc b/tests/cefclient/browser/browser_window_std_win.cc similarity index 95% rename from tests/cefclient/browser_window_std_win.cc rename to tests/cefclient/browser/browser_window_std_win.cc index 6fb7b0851..dc6c195dd 100644 --- a/tests/cefclient/browser_window_std_win.cc +++ b/tests/cefclient/browser/browser_window_std_win.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 "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 { diff --git a/tests/cefclient/browser_window_std_win.h b/tests/cefclient/browser/browser_window_std_win.h similarity index 85% rename from tests/cefclient/browser_window_std_win.h rename to tests/cefclient/browser/browser_window_std_win.h index eb942aa4e..52abd498c 100644 --- a/tests/cefclient/browser_window_std_win.h +++ b/tests/cefclient/browser/browser_window_std_win.h @@ -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_ diff --git a/tests/cefclient/bytes_write_handler.cc b/tests/cefclient/browser/bytes_write_handler.cc similarity index 97% rename from tests/cefclient/bytes_write_handler.cc rename to tests/cefclient/browser/bytes_write_handler.cc index 778fa8747..f1c0f37f1 100644 --- a/tests/cefclient/bytes_write_handler.cc +++ b/tests/cefclient/browser/bytes_write_handler.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 "cefclient/bytes_write_handler.h" +#include "cefclient/browser/bytes_write_handler.h" #include #include diff --git a/tests/cefclient/bytes_write_handler.h b/tests/cefclient/browser/bytes_write_handler.h similarity index 83% rename from tests/cefclient/bytes_write_handler.h rename to tests/cefclient/browser/bytes_write_handler.h index 9c0f8d0a7..26f9c7b0f 100644 --- a/tests/cefclient/bytes_write_handler.h +++ b/tests/cefclient/browser/bytes_write_handler.h @@ -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_ diff --git a/tests/cefclient/cefclient_gtk.cc b/tests/cefclient/browser/cefclient_gtk.cc similarity index 95% rename from tests/cefclient/cefclient_gtk.cc rename to tests/cefclient/browser/cefclient_gtk.cc index f3fafe300..ac72ff068 100644 --- a/tests/cefclient/cefclient_gtk.cc +++ b/tests/cefclient/browser/cefclient_gtk.cc @@ -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 { diff --git a/tests/cefclient/cefclient_mac.mm b/tests/cefclient/browser/cefclient_mac.mm similarity index 94% rename from tests/cefclient/cefclient_mac.mm rename to tests/cefclient/browser/cefclient_mac.mm index 36118b559..2f46ae1d5 100644 --- a/tests/cefclient/cefclient_mac.mm +++ b/tests/cefclient/browser/cefclient_mac.mm @@ -6,13 +6,12 @@ #import #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[]) { diff --git a/tests/cefclient/cefclient_win.cc b/tests/cefclient/browser/cefclient_win.cc similarity index 91% rename from tests/cefclient/cefclient_win.cc rename to tests/cefclient/browser/cefclient_win.cc index 2556791df..734ad0ef6 100644 --- a/tests/cefclient/cefclient_win.cc +++ b/tests/cefclient/browser/cefclient_win.cc @@ -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 diff --git a/tests/cefclient/browser/client_app_delegates_browser.cc b/tests/cefclient/browser/client_app_delegates_browser.cc new file mode 100644 index 000000000..5a2b7065b --- /dev/null +++ b/tests/cefclient/browser/client_app_delegates_browser.cc @@ -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 ClientApp::CreatePrintHandler() { +#if defined(OS_LINUX) + return new ClientPrintHandlerGtk(); +#else + return NULL; +#endif +} + +} // namespace client diff --git a/tests/cefclient/client_handler.cc b/tests/cefclient/browser/client_handler.cc similarity index 97% rename from tests/cefclient/client_handler.cc rename to tests/cefclient/browser/client_handler.cc index c7a440530..c960d8d9a 100644 --- a/tests/cefclient/client_handler.cc +++ b/tests/cefclient/browser/client_handler.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 "cefclient/client_handler.h" +#include "cefclient/browser/client_handler.h" #include #include @@ -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 diff --git a/tests/cefclient/client_handler.h b/tests/cefclient/browser/client_handler.h similarity index 97% rename from tests/cefclient/client_handler.h rename to tests/cefclient/browser/client_handler.h index 1dfe2c33b..301bdfee8 100644 --- a/tests/cefclient/client_handler.h +++ b/tests/cefclient/browser/client_handler.h @@ -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 @@ -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_ diff --git a/tests/cefclient/client_handler_osr.cc b/tests/cefclient/browser/client_handler_osr.cc similarity index 98% rename from tests/cefclient/client_handler_osr.cc rename to tests/cefclient/browser/client_handler_osr.cc index 044d340fa..5bbc0522b 100644 --- a/tests/cefclient/client_handler_osr.cc +++ b/tests/cefclient/browser/client_handler_osr.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 "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" diff --git a/tests/cefclient/client_handler_osr.h b/tests/cefclient/browser/client_handler_osr.h similarity index 95% rename from tests/cefclient/client_handler_osr.h rename to tests/cefclient/browser/client_handler_osr.h index ddbfd0009..1e32c1b96 100644 --- a/tests/cefclient/client_handler_osr.h +++ b/tests/cefclient/browser/client_handler_osr.h @@ -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_ diff --git a/tests/cefclient/client_handler_std.cc b/tests/cefclient/browser/client_handler_std.cc similarity index 89% rename from tests/cefclient/client_handler_std.cc rename to tests/cefclient/browser/client_handler_std.cc index a2919c345..d3625aaa4 100644 --- a/tests/cefclient/client_handler_std.cc +++ b/tests/cefclient/browser/client_handler_std.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 "cefclient/client_handler_std.h" +#include "cefclient/browser/client_handler_std.h" namespace client { diff --git a/tests/cefclient/client_handler_std.h b/tests/cefclient/browser/client_handler_std.h similarity index 73% rename from tests/cefclient/client_handler_std.h rename to tests/cefclient/browser/client_handler_std.h index d162a0199..55258c77a 100644 --- a/tests/cefclient/client_handler_std.h +++ b/tests/cefclient/browser/client_handler_std.h @@ -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_ diff --git a/tests/cefclient/client_types.h b/tests/cefclient/browser/client_types.h similarity index 80% rename from tests/cefclient/client_types.h rename to tests/cefclient/browser/client_types.h index 9cfcbf1cd..f228f4e89 100644 --- a/tests/cefclient/client_types.h +++ b/tests/cefclient/browser/client_types.h @@ -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_ diff --git a/tests/cefclient/dialog_handler_gtk.cc b/tests/cefclient/browser/dialog_handler_gtk.cc similarity index 99% rename from tests/cefclient/dialog_handler_gtk.cc rename to tests/cefclient/browser/dialog_handler_gtk.cc index 684966d46..9efbf0d29 100644 --- a/tests/cefclient/dialog_handler_gtk.cc +++ b/tests/cefclient/browser/dialog_handler_gtk.cc @@ -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 { diff --git a/tests/cefclient/dialog_handler_gtk.h b/tests/cefclient/browser/dialog_handler_gtk.h similarity index 91% rename from tests/cefclient/dialog_handler_gtk.h rename to tests/cefclient/browser/dialog_handler_gtk.h index 2ad177d8f..0286ebd29 100644 --- a/tests/cefclient/dialog_handler_gtk.h +++ b/tests/cefclient/browser/dialog_handler_gtk.h @@ -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 @@ -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_ diff --git a/tests/cefclient/dialog_test.cc b/tests/cefclient/browser/dialog_test.cc similarity index 99% rename from tests/cefclient/dialog_test.cc rename to tests/cefclient/browser/dialog_test.cc index 7c3f6c9ec..b1937199b 100644 --- a/tests/cefclient/dialog_test.cc +++ b/tests/cefclient/browser/dialog_test.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 "cefclient/dialog_test.h" +#include "cefclient/browser/dialog_test.h" #include diff --git a/tests/cefclient/dialog_test.h b/tests/cefclient/browser/dialog_test.h similarity index 66% rename from tests/cefclient/dialog_test.h rename to tests/cefclient/browser/dialog_test.h index 09d18b3ff..a4a5d8dec 100644 --- a/tests/cefclient/dialog_test.h +++ b/tests/cefclient/browser/dialog_test.h @@ -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_ diff --git a/tests/cefclient/main_context.cc b/tests/cefclient/browser/main_context.cc similarity index 92% rename from tests/cefclient/main_context.cc rename to tests/cefclient/browser/main_context.cc index beee71488..a06a6cd29 100644 --- a/tests/cefclient/main_context.cc +++ b/tests/cefclient/browser/main_context.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 "cefclient/main_context.h" +#include "cefclient/browser/main_context.h" #include "include/base/cef_logging.h" diff --git a/tests/cefclient/main_context.h b/tests/cefclient/browser/main_context.h similarity index 88% rename from tests/cefclient/main_context.h rename to tests/cefclient/browser/main_context.h index c0e05b56d..a2772ecee 100644 --- a/tests/cefclient/main_context.h +++ b/tests/cefclient/browser/main_context.h @@ -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 @@ -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_ diff --git a/tests/cefclient/main_context_impl.cc b/tests/cefclient/browser/main_context_impl.cc similarity index 97% rename from tests/cefclient/main_context_impl.cc rename to tests/cefclient/browser/main_context_impl.cc index 1f6e0a6d3..60ad7ef9d 100644 --- a/tests/cefclient/main_context_impl.cc +++ b/tests/cefclient/browser/main_context_impl.cc @@ -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 { diff --git a/tests/cefclient/main_context_impl.h b/tests/cefclient/browser/main_context_impl.h similarity index 89% rename from tests/cefclient/main_context_impl.h rename to tests/cefclient/browser/main_context_impl.h index 25d9a51b4..8ab47d3a1 100644 --- a/tests/cefclient/main_context_impl.h +++ b/tests/cefclient/browser/main_context_impl.h @@ -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_ diff --git a/tests/cefclient/main_context_impl_posix.cc b/tests/cefclient/browser/main_context_impl_posix.cc similarity index 93% rename from tests/cefclient/main_context_impl_posix.cc rename to tests/cefclient/browser/main_context_impl_posix.cc index c4b75e6dd..52f509a69 100644 --- a/tests/cefclient/main_context_impl_posix.cc +++ b/tests/cefclient/browser/main_context_impl_posix.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 "cefclient/main_context_impl.h" +#include "cefclient/browser/main_context_impl.h" #include diff --git a/tests/cefclient/main_context_impl_win.cc b/tests/cefclient/browser/main_context_impl_win.cc similarity index 92% rename from tests/cefclient/main_context_impl_win.cc rename to tests/cefclient/browser/main_context_impl_win.cc index eb3e67761..b603bc5e4 100644 --- a/tests/cefclient/main_context_impl_win.cc +++ b/tests/cefclient/browser/main_context_impl_win.cc @@ -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 #include -#include "cefclient/root_window_manager.h" - namespace client { std::string MainContextImpl::GetDownloadPath(const std::string& file_name) { diff --git a/tests/cefclient/main_message_loop.cc b/tests/cefclient/browser/main_message_loop.cc similarity index 94% rename from tests/cefclient/main_message_loop.cc rename to tests/cefclient/browser/main_message_loop.cc index 286e16b2c..a29e29ffd 100644 --- a/tests/cefclient/main_message_loop.cc +++ b/tests/cefclient/browser/main_message_loop.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 "cefclient/main_message_loop.h" +#include "cefclient/browser/main_message_loop.h" #include "include/cef_task.h" #include "include/wrapper/cef_closure_task.h" diff --git a/tests/cefclient/main_message_loop.h b/tests/cefclient/browser/main_message_loop.h similarity index 94% rename from tests/cefclient/main_message_loop.h rename to tests/cefclient/browser/main_message_loop.h index d97e52f68..ad6a09c46 100644 --- a/tests/cefclient/main_message_loop.h +++ b/tests/cefclient/browser/main_message_loop.h @@ -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_ diff --git a/tests/cefclient/main_message_loop_multithreaded_win.cc b/tests/cefclient/browser/main_message_loop_multithreaded_win.cc similarity index 96% rename from tests/cefclient/main_message_loop_multithreaded_win.cc rename to tests/cefclient/browser/main_message_loop_multithreaded_win.cc index eec47db5a..d9e659f42 100644 --- a/tests/cefclient/main_message_loop_multithreaded_win.cc +++ b/tests/cefclient/browser/main_message_loop_multithreaded_win.cc @@ -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 { diff --git a/tests/cefclient/main_message_loop_multithreaded_win.h b/tests/cefclient/browser/main_message_loop_multithreaded_win.h similarity index 85% rename from tests/cefclient/main_message_loop_multithreaded_win.h rename to tests/cefclient/browser/main_message_loop_multithreaded_win.h index ffa7e1f99..0e8ab3d93 100644 --- a/tests/cefclient/main_message_loop_multithreaded_win.h +++ b/tests/cefclient/browser/main_message_loop_multithreaded_win.h @@ -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 #include #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_ diff --git a/tests/cefclient/main_message_loop_std.cc b/tests/cefclient/browser/main_message_loop_std.cc similarity index 94% rename from tests/cefclient/main_message_loop_std.cc rename to tests/cefclient/browser/main_message_loop_std.cc index e64de99dd..2dc34c1ec 100644 --- a/tests/cefclient/main_message_loop_std.cc +++ b/tests/cefclient/browser/main_message_loop_std.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 "cefclient/main_message_loop_std.h" +#include "cefclient/browser/main_message_loop_std.h" #include "include/cef_app.h" diff --git a/tests/cefclient/main_message_loop_std.h b/tests/cefclient/browser/main_message_loop_std.h similarity index 76% rename from tests/cefclient/main_message_loop_std.h rename to tests/cefclient/browser/main_message_loop_std.h index 5fa092ddc..15aa11b55 100644 --- a/tests/cefclient/main_message_loop_std.h +++ b/tests/cefclient/browser/main_message_loop_std.h @@ -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_ diff --git a/tests/cefclient/osr_dragdrop_events.h b/tests/cefclient/browser/osr_dragdrop_events.h similarity index 77% rename from tests/cefclient/osr_dragdrop_events.h rename to tests/cefclient/browser/osr_dragdrop_events.h index 3063405e4..854e756c9 100644 --- a/tests/cefclient/osr_dragdrop_events.h +++ b/tests/cefclient/browser/osr_dragdrop_events.h @@ -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_ diff --git a/tests/cefclient/osr_dragdrop_win.cc b/tests/cefclient/browser/osr_dragdrop_win.cc similarity index 99% rename from tests/cefclient/osr_dragdrop_win.cc rename to tests/cefclient/browser/osr_dragdrop_win.cc index 690d932b6..75f144fc4 100644 --- a/tests/cefclient/osr_dragdrop_win.cc +++ b/tests/cefclient/browser/osr_dragdrop_win.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 "cefclient/osr_dragdrop_win.h" +#include "cefclient/browser/osr_dragdrop_win.h" #if defined(CEF_USE_ATL) @@ -14,9 +14,9 @@ #include #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 { diff --git a/tests/cefclient/osr_dragdrop_win.h b/tests/cefclient/browser/osr_dragdrop_win.h similarity index 95% rename from tests/cefclient/osr_dragdrop_win.h rename to tests/cefclient/browser/osr_dragdrop_win.h index 0573ae12c..acbbf782f 100644 --- a/tests/cefclient/osr_dragdrop_win.h +++ b/tests/cefclient/browser/osr_dragdrop_win.h @@ -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 #include -#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_ diff --git a/tests/cefclient/osr_renderer.cc b/tests/cefclient/browser/osr_renderer.cc similarity index 99% rename from tests/cefclient/osr_renderer.cc rename to tests/cefclient/browser/osr_renderer.cc index bf63788bb..2484b7dd4 100644 --- a/tests/cefclient/osr_renderer.cc +++ b/tests/cefclient/browser/osr_renderer.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 "cefclient/osr_renderer.h" +#include "cefclient/browser/osr_renderer.h" #if defined(OS_WIN) #include diff --git a/tests/cefclient/osr_renderer.h b/tests/cefclient/browser/osr_renderer.h similarity index 89% rename from tests/cefclient/osr_renderer.h rename to tests/cefclient/browser/osr_renderer.h index 473a80c5a..a41bee8a1 100644 --- a/tests/cefclient/osr_renderer.h +++ b/tests/cefclient/browser/osr_renderer.h @@ -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_ diff --git a/tests/cefclient/osr_window_win.cc b/tests/cefclient/browser/osr_window_win.cc similarity index 99% rename from tests/cefclient/osr_window_win.cc rename to tests/cefclient/browser/osr_window_win.cc index e1aea779c..30b3465e8 100644 --- a/tests/cefclient/osr_window_win.cc +++ b/tests/cefclient/browser/osr_window_win.cc @@ -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 #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 { diff --git a/tests/cefclient/osr_window_win.h b/tests/cefclient/browser/osr_window_win.h similarity index 94% rename from tests/cefclient/osr_window_win.h rename to tests/cefclient/browser/osr_window_win.h index 540d8ef5d..3a1a54116 100644 --- a/tests/cefclient/osr_window_win.h +++ b/tests/cefclient/browser/osr_window_win.h @@ -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_ diff --git a/tests/cefclient/print_handler_gtk.cc b/tests/cefclient/browser/print_handler_gtk.cc similarity index 99% rename from tests/cefclient/print_handler_gtk.cc rename to tests/cefclient/browser/print_handler_gtk.cc index 6437e2065..076c1846d 100644 --- a/tests/cefclient/print_handler_gtk.cc +++ b/tests/cefclient/browser/print_handler_gtk.cc @@ -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 diff --git a/tests/cefclient/print_handler_gtk.h b/tests/cefclient/browser/print_handler_gtk.h similarity index 92% rename from tests/cefclient/print_handler_gtk.h rename to tests/cefclient/browser/print_handler_gtk.h index 4ac163dcf..819a2f7ae 100644 --- a/tests/cefclient/print_handler_gtk.h +++ b/tests/cefclient/browser/print_handler_gtk.h @@ -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 @@ -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_ diff --git a/tests/cefclient/resource.h b/tests/cefclient/browser/resource.h similarity index 100% rename from tests/cefclient/resource.h rename to tests/cefclient/browser/resource.h diff --git a/tests/cefclient/resource_util.h b/tests/cefclient/browser/resource_util.h similarity index 80% rename from tests/cefclient/resource_util.h rename to tests/cefclient/browser/resource_util.h index 568feeea3..7ad66b759 100644 --- a/tests/cefclient/resource_util.h +++ b/tests/cefclient/browser/resource_util.h @@ -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 @@ -24,4 +24,4 @@ CefRefPtr GetBinaryResourceReader(const char* resource_name); } // namespace client -#endif // CEF_TESTS_CEFCLIENT_RESOURCE_UTIL_H_ +#endif // CEF_TESTS_CEFCLIENT_BROWSER_RESOURCE_UTIL_H_ diff --git a/tests/cefclient/resource_util_linux.cc b/tests/cefclient/browser/resource_util_linux.cc similarity index 94% rename from tests/cefclient/resource_util_linux.cc rename to tests/cefclient/browser/resource_util_linux.cc index 408bf10c2..04dd14de5 100644 --- a/tests/cefclient/resource_util_linux.cc +++ b/tests/cefclient/browser/resource_util_linux.cc @@ -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 #include #include diff --git a/tests/cefclient/resource_util_mac.mm b/tests/cefclient/browser/resource_util_mac.mm similarity index 97% rename from tests/cefclient/resource_util_mac.mm rename to tests/cefclient/browser/resource_util_mac.mm index 3b8ed96f4..0c314399f 100644 --- a/tests/cefclient/resource_util_mac.mm +++ b/tests/cefclient/browser/resource_util_mac.mm @@ -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 #include diff --git a/tests/cefclient/resource_util_posix.cc b/tests/cefclient/browser/resource_util_posix.cc similarity index 96% rename from tests/cefclient/resource_util_posix.cc rename to tests/cefclient/browser/resource_util_posix.cc index 96dfa5706..00b8d6c45 100644 --- a/tests/cefclient/resource_util_posix.cc +++ b/tests/cefclient/browser/resource_util_posix.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 "cefclient/resource_util.h" +#include "cefclient/browser/resource_util.h" + #include namespace client { diff --git a/tests/cefclient/resource_util_win.cc b/tests/cefclient/browser/resource_util_win.cc similarity index 96% rename from tests/cefclient/resource_util_win.cc rename to tests/cefclient/browser/resource_util_win.cc index c4314df55..64b4c35bf 100644 --- a/tests/cefclient/resource_util_win.cc +++ b/tests/cefclient/browser/resource_util_win.cc @@ -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 { diff --git a/tests/cefclient/root_window.cc b/tests/cefclient/browser/root_window.cc similarity index 74% rename from tests/cefclient/root_window.cc rename to tests/cefclient/browser/root_window.cc index 6c4b5b4d4..ca87538bc 100644 --- a/tests/cefclient/root_window.cc +++ b/tests/cefclient/browser/root_window.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 "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 { diff --git a/tests/cefclient/root_window.h b/tests/cefclient/browser/root_window.h similarity index 93% rename from tests/cefclient/root_window.h rename to tests/cefclient/browser/root_window.h index 5d615f0fc..f09d46f2f 100644 --- a/tests/cefclient/root_window.h +++ b/tests/cefclient/browser/root_window.h @@ -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 #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_ diff --git a/tests/cefclient/root_window_gtk.cc b/tests/cefclient/browser/root_window_gtk.cc similarity index 98% rename from tests/cefclient/root_window_gtk.cc rename to tests/cefclient/browser/root_window_gtk.cc index fd6490892..f5f77c971 100644 --- a/tests/cefclient/root_window_gtk.cc +++ b/tests/cefclient/browser/root_window_gtk.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 "cefclient/root_window_gtk.h" +#include "cefclient/browser/root_window_gtk.h" #include #include @@ -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 { diff --git a/tests/cefclient/root_window_gtk.h b/tests/cefclient/browser/root_window_gtk.h similarity index 95% rename from tests/cefclient/root_window_gtk.h rename to tests/cefclient/browser/root_window_gtk.h index 8b260823b..015ce3212 100644 --- a/tests/cefclient/root_window_gtk.h +++ b/tests/cefclient/browser/root_window_gtk.h @@ -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 #include #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_ diff --git a/tests/cefclient/root_window_mac.h b/tests/cefclient/browser/root_window_mac.h similarity index 91% rename from tests/cefclient/root_window_mac.h rename to tests/cefclient/browser/root_window_mac.h index 1c08a56a8..f7048de85 100644 --- a/tests/cefclient/root_window_mac.h +++ b/tests/cefclient/browser/root_window_mac.h @@ -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 #include #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_ diff --git a/tests/cefclient/root_window_mac.mm b/tests/cefclient/browser/root_window_mac.mm similarity index 98% rename from tests/cefclient/root_window_mac.mm rename to tests/cefclient/browser/root_window_mac.mm index a0501e267..60f3e6a82 100644 --- a/tests/cefclient/root_window_mac.mm +++ b/tests/cefclient/browser/root_window_mac.mm @@ -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. diff --git a/tests/cefclient/root_window_manager.cc b/tests/cefclient/browser/root_window_manager.cc similarity index 96% rename from tests/cefclient/root_window_manager.cc rename to tests/cefclient/browser/root_window_manager.cc index 9e8acfeec..9a6f15e1c 100644 --- a/tests/cefclient/root_window_manager.cc +++ b/tests/cefclient/browser/root_window_manager.cc @@ -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 { diff --git a/tests/cefclient/root_window_manager.h b/tests/cefclient/browser/root_window_manager.h similarity index 91% rename from tests/cefclient/root_window_manager.h rename to tests/cefclient/browser/root_window_manager.h index d81ec2def..d5453018e 100644 --- a/tests/cefclient/root_window_manager.h +++ b/tests/cefclient/browser/root_window_manager.h @@ -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 #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_ diff --git a/tests/cefclient/root_window_win.cc b/tests/cefclient/browser/root_window_win.cc similarity index 98% rename from tests/cefclient/root_window_win.cc rename to tests/cefclient/browser/root_window_win.cc index 00779938c..470d141cd 100644 --- a/tests/cefclient/root_window_win.cc +++ b/tests/cefclient/browser/root_window_win.cc @@ -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() { diff --git a/tests/cefclient/root_window_win.h b/tests/cefclient/browser/root_window_win.h similarity index 93% rename from tests/cefclient/root_window_win.h rename to tests/cefclient/browser/root_window_win.h index e3f130858..34c615ea3 100644 --- a/tests/cefclient/root_window_win.h +++ b/tests/cefclient/browser/root_window_win.h @@ -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 #include @@ -11,8 +12,8 @@ #include #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_ diff --git a/tests/cefclient/scheme_test.cc b/tests/cefclient/browser/scheme_test.cc similarity index 97% rename from tests/cefclient/scheme_test.cc rename to tests/cefclient/browser/scheme_test.cc index 544ca58bc..3e92a1e0f 100644 --- a/tests/cefclient/scheme_test.cc +++ b/tests/cefclient/browser/scheme_test.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 "cefclient/scheme_test.h" +#include "cefclient/browser/scheme_test.h" #include #include @@ -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 { diff --git a/tests/cefclient/browser/scheme_test.h b/tests/cefclient/browser/scheme_test.h new file mode 100644 index 000000000..ff65a7959 --- /dev/null +++ b/tests/cefclient/browser/scheme_test.h @@ -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_ diff --git a/tests/cefclient/temp_window.h b/tests/cefclient/browser/temp_window.h similarity index 58% rename from tests/cefclient/temp_window.h rename to tests/cefclient/browser/temp_window.h index 5a6d972c2..1e9f038e0 100644 --- a/tests/cefclient/temp_window.h +++ b/tests/cefclient/browser/temp_window.h @@ -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_ diff --git a/tests/cefclient/temp_window_mac.h b/tests/cefclient/browser/temp_window_mac.h similarity index 74% rename from tests/cefclient/temp_window_mac.h rename to tests/cefclient/browser/temp_window_mac.h index 6510a820a..552ca6b4a 100644 --- a/tests/cefclient/temp_window_mac.h +++ b/tests/cefclient/browser/temp_window_mac.h @@ -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_ diff --git a/tests/cefclient/temp_window_mac.mm b/tests/cefclient/browser/temp_window_mac.mm similarity index 95% rename from tests/cefclient/temp_window_mac.mm rename to tests/cefclient/browser/temp_window_mac.mm index 84e941988..80524397f 100644 --- a/tests/cefclient/temp_window_mac.mm +++ b/tests/cefclient/browser/temp_window_mac.mm @@ -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 diff --git a/tests/cefclient/temp_window_win.cc b/tests/cefclient/browser/temp_window_win.cc similarity index 96% rename from tests/cefclient/temp_window_win.cc rename to tests/cefclient/browser/temp_window_win.cc index 8973ecc90..a2585d586 100644 --- a/tests/cefclient/temp_window_win.cc +++ b/tests/cefclient/browser/temp_window_win.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 "cefclient/temp_window_win.h" +#include "cefclient/browser/temp_window_win.h" #include diff --git a/tests/cefclient/temp_window_win.h b/tests/cefclient/browser/temp_window_win.h similarity index 79% rename from tests/cefclient/temp_window_win.h rename to tests/cefclient/browser/temp_window_win.h index a3c1526d3..9f571ac98 100644 --- a/tests/cefclient/temp_window_win.h +++ b/tests/cefclient/browser/temp_window_win.h @@ -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_ diff --git a/tests/cefclient/temp_window_x11.cc b/tests/cefclient/browser/temp_window_x11.cc similarity index 96% rename from tests/cefclient/temp_window_x11.cc rename to tests/cefclient/browser/temp_window_x11.cc index aec15f700..e77fff582 100644 --- a/tests/cefclient/temp_window_x11.cc +++ b/tests/cefclient/browser/temp_window_x11.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 "cefclient/temp_window_x11.h" +#include "cefclient/browser/temp_window_x11.h" #include diff --git a/tests/cefclient/temp_window_x11.h b/tests/cefclient/browser/temp_window_x11.h similarity index 79% rename from tests/cefclient/temp_window_x11.h rename to tests/cefclient/browser/temp_window_x11.h index b5adc6efc..a48ce9cc5 100644 --- a/tests/cefclient/temp_window_x11.h +++ b/tests/cefclient/browser/temp_window_x11.h @@ -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_ diff --git a/tests/cefclient/test_runner.cc b/tests/cefclient/browser/test_runner.cc similarity index 97% rename from tests/cefclient/test_runner.cc rename to tests/cefclient/browser/test_runner.cc index 7cd48a0c3..5eba5ca6f 100644 --- a/tests/cefclient/test_runner.cc +++ b/tests/cefclient/browser/test_runner.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 "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 { diff --git a/tests/cefclient/test_runner.h b/tests/cefclient/browser/test_runner.h similarity index 88% rename from tests/cefclient/test_runner.h rename to tests/cefclient/browser/test_runner.h index 2dc428398..b1bbb581d 100644 --- a/tests/cefclient/test_runner.h +++ b/tests/cefclient/browser/test_runner.h @@ -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 #include @@ -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_ diff --git a/tests/cefclient/util_win.cc b/tests/cefclient/browser/util_win.cc similarity index 98% rename from tests/cefclient/util_win.cc rename to tests/cefclient/browser/util_win.cc index 00407b726..8eb758d9f 100644 --- a/tests/cefclient/util_win.cc +++ b/tests/cefclient/browser/util_win.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 "cefclient/util_win.h" +#include "cefclient/browser/util_win.h" #include "include/base/cef_logging.h" #include "include/internal/cef_types.h" diff --git a/tests/cefclient/util_win.h b/tests/cefclient/browser/util_win.h similarity index 84% rename from tests/cefclient/util_win.h rename to tests/cefclient/browser/util_win.h index 986a1e3f5..ad092def6 100644 --- a/tests/cefclient/util_win.h +++ b/tests/cefclient/browser/util_win.h @@ -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 #include @@ -27,3 +31,5 @@ int GetCefKeyboardModifiers(WPARAM wparam, LPARAM lparam); bool IsKeyDown(WPARAM wparam); } // namespace client + +#endif // CEF_TESTS_CEFCLIENT_BROWSER_UTIL_WIN_H_ diff --git a/tests/cefclient/window_test.cc b/tests/cefclient/browser/window_test.cc similarity index 97% rename from tests/cefclient/window_test.cc rename to tests/cefclient/browser/window_test.cc index 18c2ffa9f..a6ea1084a 100644 --- a/tests/cefclient/window_test.cc +++ b/tests/cefclient/browser/window_test.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 "cefclient/window_test.h" +#include "cefclient/browser/window_test.h" #include #include @@ -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 { diff --git a/tests/cefclient/window_test.h b/tests/cefclient/browser/window_test.h similarity index 80% rename from tests/cefclient/window_test.h rename to tests/cefclient/browser/window_test.h index a81f0fe9f..9dd2a9e67 100644 --- a/tests/cefclient/window_test.h +++ b/tests/cefclient/browser/window_test.h @@ -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 browser); } // namespace window_test } // namespace client -#endif // CEF_TESTS_CEFCLIENT_WINDOW_TEST_H_ +#endif // CEF_TESTS_CEFCLIENT_BROWSER_WINDOW_TEST_H_ diff --git a/tests/cefclient/window_test_gtk.cc b/tests/cefclient/browser/window_test_gtk.cc similarity index 96% rename from tests/cefclient/window_test_gtk.cc rename to tests/cefclient/browser/window_test_gtk.cc index 7492825d5..72ddfcf84 100644 --- a/tests/cefclient/window_test_gtk.cc +++ b/tests/cefclient/browser/window_test_gtk.cc @@ -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 -#include "cefclient/root_window.h" +#include "cefclient/browser/root_window.h" namespace client { namespace window_test { diff --git a/tests/cefclient/window_test_mac.mm b/tests/cefclient/browser/window_test_mac.mm similarity index 97% rename from tests/cefclient/window_test_mac.mm rename to tests/cefclient/browser/window_test_mac.mm index 5580b2fae..a4003d7ae 100644 --- a/tests/cefclient/window_test_mac.mm +++ b/tests/cefclient/browser/window_test_mac.mm @@ -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 diff --git a/tests/cefclient/window_test_win.cc b/tests/cefclient/browser/window_test_win.cc similarity index 98% rename from tests/cefclient/window_test_win.cc rename to tests/cefclient/browser/window_test_win.cc index 65fc3a165..77f4a89af 100644 --- a/tests/cefclient/window_test_win.cc +++ b/tests/cefclient/browser/window_test_win.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 "cefclient/window_test.h" +#include "cefclient/browser/window_test.h" namespace client { namespace window_test { diff --git a/tests/cefclient/client_app_delegates.cc b/tests/cefclient/client_app_delegates.cc deleted file mode 100644 index 1339b0d53..000000000 --- a/tests/cefclient/client_app_delegates.cc +++ /dev/null @@ -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 registrar, - std::vector& cookiable_schemes) { - scheme_test::RegisterCustomSchemes(registrar, cookiable_schemes); -} - -// static -CefRefPtr ClientApp::CreatePrintHandler() { -#if defined(OS_LINUX) - return new ClientPrintHandlerGtk(); -#else - return NULL; -#endif -} - -} // namespace client diff --git a/tests/cefclient/client_app.cc b/tests/cefclient/common/client_app.cc similarity index 100% rename from tests/cefclient/client_app.cc rename to tests/cefclient/common/client_app.cc diff --git a/tests/cefclient/client_app.h b/tests/cefclient/common/client_app.h similarity index 98% rename from tests/cefclient/client_app.h rename to tests/cefclient/common/client_app.h index c95ca35fc..59a7c52b5 100644 --- a/tests/cefclient/client_app.h +++ b/tests/cefclient/common/client_app.h @@ -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 @@ -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_ diff --git a/tests/cefclient/common/client_app_delegates_common.cc b/tests/cefclient/common/client_app_delegates_common.cc new file mode 100644 index 000000000..c5a9acb1a --- /dev/null +++ b/tests/cefclient/common/client_app_delegates_common.cc @@ -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 registrar, + std::vector& cookiable_schemes) { + scheme_test::RegisterCustomSchemes(registrar, cookiable_schemes); +} + +} // namespace client diff --git a/tests/cefclient/client_switches.cc b/tests/cefclient/common/client_switches.cc similarity index 100% rename from tests/cefclient/client_switches.cc rename to tests/cefclient/common/client_switches.cc diff --git a/tests/cefclient/client_switches.h b/tests/cefclient/common/client_switches.h similarity index 79% rename from tests/cefclient/client_switches.h rename to tests/cefclient/common/client_switches.h index 224b138a0..019af31fd 100644 --- a/tests/cefclient/client_switches.h +++ b/tests/cefclient/common/client_switches.h @@ -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_ diff --git a/tests/cefclient/scheme_test_common.cc b/tests/cefclient/common/scheme_test_common.cc similarity index 91% rename from tests/cefclient/scheme_test_common.cc rename to tests/cefclient/common/scheme_test_common.cc index 496e44e1c..ba34488fc 100644 --- a/tests/cefclient/scheme_test_common.cc +++ b/tests/cefclient/common/scheme_test_common.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 "cefclient/scheme_test.h" +#include "cefclient/common/scheme_test_common.h" #include "include/cef_scheme.h" diff --git a/tests/cefclient/scheme_test.h b/tests/cefclient/common/scheme_test_common.h similarity index 60% rename from tests/cefclient/scheme_test.h rename to tests/cefclient/common/scheme_test_common.h index ca14fa5c1..3c9b384ce 100644 --- a/tests/cefclient/scheme_test.h +++ b/tests/cefclient/common/scheme_test_common.h @@ -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 -#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 registrar, std::vector& 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_ diff --git a/tests/cefclient/renderer/client_app_delegates_renderer.cc b/tests/cefclient/renderer/client_app_delegates_renderer.cc new file mode 100644 index 000000000..82fa452dd --- /dev/null +++ b/tests/cefclient/renderer/client_app_delegates_renderer.cc @@ -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/renderer/client_renderer.h" +#include "cefclient/renderer/performance_test.h" + +namespace client { + +// static +void ClientApp::CreateRenderDelegates(RenderDelegateSet& delegates) { + renderer::CreateRenderDelegates(delegates); + performance_test::CreateRenderDelegates(delegates); +} + +} // namespace client diff --git a/tests/cefclient/renderer/client_app_delegates_stubs_mac.cc b/tests/cefclient/renderer/client_app_delegates_stubs_mac.cc new file mode 100644 index 000000000..801deed1a --- /dev/null +++ b/tests/cefclient/renderer/client_app_delegates_stubs_mac.cc @@ -0,0 +1,21 @@ +// 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" + +namespace client { + +// Stub implementations of ClientApp methods that are only used in the browser +// process. + +// static +void ClientApp::CreateBrowserDelegates(BrowserDelegateSet& delegates) { +} + +// static +CefRefPtr ClientApp::CreatePrintHandler() { + return NULL; +} + +} // namespace client diff --git a/tests/cefclient/client_renderer.cc b/tests/cefclient/renderer/client_renderer.cc similarity index 96% rename from tests/cefclient/client_renderer.cc rename to tests/cefclient/renderer/client_renderer.cc index 1128a99bb..275d64354 100644 --- a/tests/cefclient/client_renderer.cc +++ b/tests/cefclient/renderer/client_renderer.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 "cefclient/client_renderer.h" +#include "cefclient/renderer/client_renderer.h" #include #include @@ -14,10 +14,11 @@ namespace client { namespace renderer { -const char kFocusedNodeChangedMessage[] = "ClientRenderer.FocusedNodeChanged"; - namespace { +// Must match the value in client_handler.cc. +const char kFocusedNodeChangedMessage[] = "ClientRenderer.FocusedNodeChanged"; + class ClientRenderDelegate : public ClientApp::RenderDelegate { public: ClientRenderDelegate() diff --git a/tests/cefclient/client_renderer.h b/tests/cefclient/renderer/client_renderer.h similarity index 60% rename from tests/cefclient/client_renderer.h rename to tests/cefclient/renderer/client_renderer.h index 07c4d7cf6..ac56f05b4 100644 --- a/tests/cefclient/client_renderer.h +++ b/tests/cefclient/renderer/client_renderer.h @@ -2,23 +2,20 @@ // 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_RENDERER_H_ -#define CEF_TESTS_CEFCLIENT_CLIENT_RENDERER_H_ +#ifndef CEF_TESTS_CEFCLIENT_RENDERER_CLIENT_RENDERER_H_ +#define CEF_TESTS_CEFCLIENT_RENDERER_CLIENT_RENDERER_H_ #pragma once #include "include/cef_base.h" -#include "cefclient/client_app.h" +#include "cefclient/common/client_app.h" namespace client { namespace renderer { -// Message sent when the focused node changes. -extern const char kFocusedNodeChangedMessage[]; - // Create the render delegate. void CreateRenderDelegates(ClientApp::RenderDelegateSet& delegates); } // namespace renderer } // namespace client -#endif // CEF_TESTS_CEFCLIENT_CLIENT_RENDERER_H_ +#endif // CEF_TESTS_CEFCLIENT_RENDERER_CLIENT_RENDERER_H_ diff --git a/tests/cefclient/performance_test.cc b/tests/cefclient/renderer/performance_test.cc similarity index 97% rename from tests/cefclient/performance_test.cc rename to tests/cefclient/renderer/performance_test.cc index f9e0feba7..4b89650cb 100644 --- a/tests/cefclient/performance_test.cc +++ b/tests/cefclient/renderer/performance_test.cc @@ -2,13 +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/performance_test.h" +#include "cefclient/renderer/performance_test.h" #include #include #include "include/wrapper/cef_stream_resource_handler.h" -#include "cefclient/performance_test_setup.h" +#include "cefclient/renderer/performance_test_setup.h" namespace client { namespace performance_test { diff --git a/tests/cefclient/performance_test.h b/tests/cefclient/renderer/performance_test.h similarity index 67% rename from tests/cefclient/performance_test.h rename to tests/cefclient/renderer/performance_test.h index 055e17186..2888e25ed 100644 --- a/tests/cefclient/performance_test.h +++ b/tests/cefclient/renderer/performance_test.h @@ -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_PERFORMANCE_TEST_H_ -#define CEF_TESTS_CEFCLIENT_PERFORMANCE_TEST_H_ +#ifndef CEF_TESTS_CEFCLIENT_RENDERER_PERFORMANCE_TEST_H_ +#define CEF_TESTS_CEFCLIENT_RENDERER_PERFORMANCE_TEST_H_ #pragma once -#include "cefclient/client_app.h" +#include "cefclient/common/client_app.h" namespace client { namespace performance_test { @@ -17,4 +17,4 @@ void CreateRenderDelegates(ClientApp::RenderDelegateSet& delegates); } // namespace performance_test } // namespace client -#endif // CEF_TESTS_CEFCLIENT_PERFORMANCE_TEST_H_ +#endif // CEF_TESTS_CEFCLIENT_RENDERER_PERFORMANCE_TEST_H_ diff --git a/tests/cefclient/performance_test_setup.h b/tests/cefclient/renderer/performance_test_setup.h similarity index 92% rename from tests/cefclient/performance_test_setup.h rename to tests/cefclient/renderer/performance_test_setup.h index 726ba9e33..664a8cffc 100644 --- a/tests/cefclient/performance_test_setup.h +++ b/tests/cefclient/renderer/performance_test_setup.h @@ -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_PERFORMANCE_TEST_SETUP_H_ -#define CEF_TESTS_CEFCLIENT_PERFORMANCE_TEST_SETUP_H_ +#ifndef CEF_TESTS_CEFCLIENT_RENDERER_PERFORMANCE_TEST_SETUP_H_ +#define CEF_TESTS_CEFCLIENT_RENDERER_PERFORMANCE_TEST_SETUP_H_ #pragma once #include "include/base/cef_macros.h" @@ -101,4 +101,4 @@ extern const int kPerfTestsCount; } // namespace performance_test } // namespace client -#endif // CEF_TESTS_CEFCLIENT_PERFORMANCE_TEST_H_ +#endif // CEF_TESTS_CEFCLIENT_RENDERER_PERFORMANCE_TEST_H_ diff --git a/tests/cefclient/performance_test_tests.cc b/tests/cefclient/renderer/performance_test_tests.cc similarity index 98% rename from tests/cefclient/performance_test_tests.cc rename to tests/cefclient/renderer/performance_test_tests.cc index d906ebf94..5181c2fb5 100644 --- a/tests/cefclient/performance_test_tests.cc +++ b/tests/cefclient/renderer/performance_test_tests.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 "cefclient/performance_test.h" -#include "cefclient/performance_test_setup.h" +#include "cefclient/renderer/performance_test.h" +#include "cefclient/renderer/performance_test_setup.h" #include "include/cef_v8.h" namespace client { diff --git a/tests/cefclient/process_helper_mac.cc b/tests/cefclient/renderer/process_helper_mac.cc similarity index 90% rename from tests/cefclient/process_helper_mac.cc rename to tests/cefclient/renderer/process_helper_mac.cc index fe16a5303..34333885a 100644 --- a/tests/cefclient/process_helper_mac.cc +++ b/tests/cefclient/renderer/process_helper_mac.cc @@ -6,7 +6,7 @@ // This file is shared by cefclient and cef_unittests so don't include using // a qualified path. -#include "client_app.h" // NOLINT(build/include) +#include "../common/client_app.h" // NOLINT(build/include) // Process entry point. int main(int argc, char* argv[]) { diff --git a/tests/cefclient/cefclient.exe.manifest b/tests/cefclient/resources/win/cefclient.exe.manifest similarity index 100% rename from tests/cefclient/cefclient.exe.manifest rename to tests/cefclient/resources/win/cefclient.exe.manifest diff --git a/tests/cefclient/cefclient.rc b/tests/cefclient/resources/win/cefclient.rc similarity index 65% rename from tests/cefclient/cefclient.rc rename to tests/cefclient/resources/win/cefclient.rc index 407b01cb5..bf5bf414d 100644 --- a/tests/cefclient/cefclient.rc +++ b/tests/cefclient/resources/win/cefclient.rc @@ -1,6 +1,6 @@ // Microsoft Visual C++ generated resource script. // -#include "resource.h" +#include "cefclient/browser/resource.h" #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// @@ -9,6 +9,7 @@ // #define APSTUDIO_HIDDEN_SYMBOLS #include "windows.h" +#include "include/cef_version.h" #undef APSTUDIO_HIDDEN_SYMBOLS ///////////////////////////////////////////////////////////////////////////// @@ -28,17 +29,17 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // Binary // -IDS_BINDING BINARY "resources\\binding.html" -IDS_DIALOGS BINARY "resources\\dialogs.html" -IDS_LOCALSTORAGE BINARY "resources\\localstorage.html" -IDS_LOGO BINARY "resources\\logo.png" -IDS_OSRTEST BINARY "resources\\osr_test.html" -IDS_OTHER_TESTS BINARY "resources\\other_tests.html" -IDS_PERFORMANCE BINARY "resources\\performance.html" -IDS_PERFORMANCE2 BINARY "resources\\performance2.html" -IDS_TRANSPARENCY BINARY "resources\\transparency.html" -IDS_WINDOW BINARY "resources\\window.html" -IDS_XMLHTTPREQUEST BINARY "resources\\xmlhttprequest.html" +IDS_BINDING BINARY "..\\binding.html" +IDS_DIALOGS BINARY "..\\dialogs.html" +IDS_LOCALSTORAGE BINARY "..\\localstorage.html" +IDS_LOGO BINARY "..\\logo.png" +IDS_OSRTEST BINARY "..\\osr_test.html" +IDS_OTHER_TESTS BINARY "..\\other_tests.html" +IDS_PERFORMANCE BINARY "..\\performance.html" +IDS_PERFORMANCE2 BINARY "..\\performance2.html" +IDS_TRANSPARENCY BINARY "..\\transparency.html" +IDS_WINDOW BINARY "..\\window.html" +IDS_XMLHTTPREQUEST BINARY "..\\xmlhttprequest.html" ///////////////////////////////////////////////////////////////////////////// // @@ -47,8 +48,8 @@ IDS_XMLHTTPREQUEST BINARY "resources\\xmlhttprequest.html" // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. -IDI_CEFCLIENT ICON "resources\win\cefclient.ico" -IDI_SMALL ICON "resources\win\small.ico" +IDI_CEFCLIENT ICON "cefclient.ico" +IDI_SMALL ICON "small.ico" ///////////////////////////////////////////////////////////////////////////// // @@ -113,6 +114,42 @@ BEGIN DEFPUSHBUTTON "OK",IDOK,195,6,30,11,WS_GROUP END +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +VS_VERSION_INFO VERSIONINFO + FILEVERSION CEF_VERSION_MAJOR,CHROME_VERSION_BUILD,CEF_REVISION,0 + PRODUCTVERSION CEF_VERSION_MAJOR,CHROME_VERSION_BUILD,CEF_REVISION,0 + FILEFLAGSMASK 0x17L +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x4L + FILETYPE 0x2L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "FileDescription", "Chromium Embedded Framework (CEF) Client Application" + VALUE "FileVersion", MAKE_STRING(CEF_VERSION_MAJOR) "." MAKE_STRING(CHROME_VERSION_BUILD) "." MAKE_STRING(CEF_REVISION) + VALUE "InternalName", "cefclient" + VALUE "LegalCopyright", "Copyright (C) " MAKE_STRING(COPYRIGHT_YEAR) " The Chromium Embedded Framework Authors" + VALUE "OriginalFilename", "cefclient.exe" + VALUE "ProductName", "Chromium Embedded Framework (CEF) Client Application" + VALUE "ProductVersion", MAKE_STRING(CEF_VERSION_MAJOR) "." MAKE_STRING(CHROME_VERSION_BUILD) "." MAKE_STRING(CEF_REVISION) + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END #ifdef APSTUDIO_INVOKED ///////////////////////////////////////////////////////////////////////////// diff --git a/tests/cefsimple/CMakeLists.txt.in b/tests/cefsimple/CMakeLists.txt.in index b4ca941bc..fb567bbe2 100644 --- a/tests/cefsimple/CMakeLists.txt.in +++ b/tests/cefsimple/CMakeLists.txt.in @@ -156,7 +156,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}" "${CEF_TARGET}") # Copy binary and resource files to the target output directory. COPY_FILES("${CEF_TARGET}" "${CEF_BINARY_FILES}" "${CEF_BINARY_DIR}" "${CEF_TARGET_OUT_DIR}") diff --git a/tests/unittests/client_app_delegates.cc b/tests/unittests/client_app_delegates.cc index ad8379799..d7413080b 100644 --- a/tests/unittests/client_app_delegates.cc +++ b/tests/unittests/client_app_delegates.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 "tests/cefclient/client_app.h" +#include "tests/cefclient/common/client_app.h" using client::ClientApp; diff --git a/tests/unittests/dom_unittest.cc b/tests/unittests/dom_unittest.cc index dd3b13536..3916e21de 100644 --- a/tests/unittests/dom_unittest.cc +++ b/tests/unittests/dom_unittest.cc @@ -7,7 +7,7 @@ #include "include/cef_dom.h" #include "testing/gtest/include/gtest/gtest.h" -#include "tests/cefclient/client_app.h" +#include "tests/cefclient/common/client_app.h" #include "tests/unittests/test_handler.h" using client::ClientApp; diff --git a/tests/unittests/frame_unittest.cc b/tests/unittests/frame_unittest.cc index 1f7edf6ad..941711185 100644 --- a/tests/unittests/frame_unittest.cc +++ b/tests/unittests/frame_unittest.cc @@ -10,7 +10,7 @@ #include "include/wrapper/cef_closure_task.h" #include "include/wrapper/cef_stream_resource_handler.h" #include "testing/gtest/include/gtest/gtest.h" -#include "tests/cefclient/client_app.h" +#include "tests/cefclient/common/client_app.h" #include "tests/unittests/test_handler.h" using client::ClientApp; diff --git a/tests/unittests/message_router_unittest.cc b/tests/unittests/message_router_unittest.cc index 47321cbe6..c3eac4ddd 100644 --- a/tests/unittests/message_router_unittest.cc +++ b/tests/unittests/message_router_unittest.cc @@ -17,7 +17,7 @@ #include "include/wrapper/cef_closure_task.h" #include "testing/gtest/include/gtest/gtest.h" #include "tests/unittests/routing_test_handler.h" -#include "tests/cefclient/client_app.h" +#include "tests/cefclient/common/client_app.h" using client::ClientApp; diff --git a/tests/unittests/navigation_unittest.cc b/tests/unittests/navigation_unittest.cc index 3d21f8c0d..955b09230 100644 --- a/tests/unittests/navigation_unittest.cc +++ b/tests/unittests/navigation_unittest.cc @@ -13,7 +13,7 @@ #include "include/cef_scheme.h" #include "include/wrapper/cef_closure_task.h" #include "testing/gtest/include/gtest/gtest.h" -#include "tests/cefclient/client_app.h" +#include "tests/cefclient/common/client_app.h" #include "tests/unittests/test_handler.h" #include "tests/unittests/test_util.h" diff --git a/tests/unittests/os_rendering_unittest.cc b/tests/unittests/os_rendering_unittest.cc index 497922df5..c3e9afe66 100644 --- a/tests/unittests/os_rendering_unittest.cc +++ b/tests/unittests/os_rendering_unittest.cc @@ -15,8 +15,8 @@ #include "include/cef_v8.h" #include "include/wrapper/cef_closure_task.h" #include "include/wrapper/cef_stream_resource_handler.h" -#include "tests/cefclient/client_app.h" -#include "tests/cefclient/resource_util.h" +#include "tests/cefclient/browser/resource_util.h" +#include "tests/cefclient/common/client_app.h" #include "tests/unittests/routing_test_handler.h" #if defined(OS_MACOSX) diff --git a/tests/unittests/process_message_unittest.cc b/tests/unittests/process_message_unittest.cc index 12ad6bd28..394981074 100644 --- a/tests/unittests/process_message_unittest.cc +++ b/tests/unittests/process_message_unittest.cc @@ -8,7 +8,7 @@ #include "include/cef_process_message.h" #include "include/cef_task.h" #include "testing/gtest/include/gtest/gtest.h" -#include "tests/cefclient/client_app.h" +#include "tests/cefclient/common/client_app.h" #include "tests/unittests/test_handler.h" #include "tests/unittests/test_util.h" diff --git a/tests/unittests/request_handler_unittest.cc b/tests/unittests/request_handler_unittest.cc index 37c97e147..17a40e4ab 100644 --- a/tests/unittests/request_handler_unittest.cc +++ b/tests/unittests/request_handler_unittest.cc @@ -11,7 +11,7 @@ #include "include/cef_cookie.h" #include "include/wrapper/cef_closure_task.h" #include "testing/gtest/include/gtest/gtest.h" -#include "tests/cefclient/client_app.h" +#include "tests/cefclient/common/client_app.h" #include "tests/unittests/test_handler.h" using client::ClientApp; diff --git a/tests/unittests/request_unittest.cc b/tests/unittests/request_unittest.cc index 2755bc1ac..fb7e336f1 100644 --- a/tests/unittests/request_unittest.cc +++ b/tests/unittests/request_unittest.cc @@ -11,7 +11,7 @@ #include "include/cef_request.h" #include "include/wrapper/cef_closure_task.h" #include "testing/gtest/include/gtest/gtest.h" -#include "tests/cefclient/client_app.h" +#include "tests/cefclient/common/client_app.h" #include "tests/unittests/test_handler.h" #include "tests/unittests/test_util.h" diff --git a/tests/unittests/routing_test_handler.cc b/tests/unittests/routing_test_handler.cc index 075c92ec2..1c75a8668 100644 --- a/tests/unittests/routing_test_handler.cc +++ b/tests/unittests/routing_test_handler.cc @@ -6,7 +6,7 @@ #include "tests/unittests/chromium_includes.h" #include "tests/unittests/routing_test_handler.h" -#include "tests/cefclient/client_app.h" +#include "tests/cefclient/common/client_app.h" using client::ClientApp; diff --git a/tests/unittests/run_all_unittests.cc b/tests/unittests/run_all_unittests.cc index 02080fb81..3ae10ae45 100644 --- a/tests/unittests/run_all_unittests.cc +++ b/tests/unittests/run_all_unittests.cc @@ -19,7 +19,7 @@ #include "include/cef_task.h" #include "include/wrapper/cef_helpers.h" #include "include/wrapper/cef_closure_task.h" -#include "tests/cefclient/client_app.h" +#include "tests/cefclient/common/client_app.h" #include "tests/unittests/test_handler.h" #include "tests/unittests/test_suite.h" diff --git a/tests/unittests/test_suite.cc b/tests/unittests/test_suite.cc index a362af7c0..e6de22536 100644 --- a/tests/unittests/test_suite.cc +++ b/tests/unittests/test_suite.cc @@ -19,7 +19,7 @@ #include "base/test/test_timeouts.h" #endif -#include "tests/cefclient/client_switches.h" +#include "tests/cefclient/common/client_switches.h" base::CommandLine* CefTestSuite::commandline_ = NULL; diff --git a/tests/unittests/urlrequest_unittest.cc b/tests/unittests/urlrequest_unittest.cc index 3cf38bd68..aabe561ba 100644 --- a/tests/unittests/urlrequest_unittest.cc +++ b/tests/unittests/urlrequest_unittest.cc @@ -19,7 +19,7 @@ #include "include/cef_urlrequest.h" #include "include/wrapper/cef_closure_task.h" #include "testing/gtest/include/gtest/gtest.h" -#include "tests/cefclient/client_app.h" +#include "tests/cefclient/common/client_app.h" #include "tests/unittests/test_handler.h" #include "tests/unittests/test_util.h" diff --git a/tests/unittests/v8_unittest.cc b/tests/unittests/v8_unittest.cc index 71497c58a..6ea716d87 100644 --- a/tests/unittests/v8_unittest.cc +++ b/tests/unittests/v8_unittest.cc @@ -11,7 +11,7 @@ #include "include/cef_task.h" #include "include/cef_v8.h" #include "include/wrapper/cef_closure_task.h" -#include "tests/cefclient/client_app.h" +#include "tests/cefclient/common/client_app.h" #include "testing/gtest/include/gtest/gtest.h" #include "tests/unittests/test_handler.h" diff --git a/tools/distrib/win/transfer.cfg b/tools/distrib/win/transfer.cfg index 4788c39e8..f798c24c9 100644 --- a/tools/distrib/win/transfer.cfg +++ b/tools/distrib/win/transfer.cfg @@ -12,7 +12,7 @@ [ { 'source' : '../build/win/compatibility.manifest', - 'target' : 'cefclient/compatibility.manifest', + 'target' : 'cefclient/resources/win/compatibility.manifest', }, { 'source' : '../build/win/compatibility.manifest', diff --git a/tools/make_distrib.py b/tools/make_distrib.py index a5d4c459d..c4228d489 100644 --- a/tools/make_distrib.py +++ b/tools/make_distrib.py @@ -369,9 +369,13 @@ if mode == 'standard': 'include/', include_dir, options.quiet) # transfer common cefclient files + transfer_gypi_files(cef_dir, cef_paths2['cefclient_sources_browser'], \ + 'tests/cefclient/', cefclient_dir, options.quiet) transfer_gypi_files(cef_dir, cef_paths2['cefclient_sources_common'], \ 'tests/cefclient/', cefclient_dir, options.quiet) - transfer_gypi_files(cef_dir, cef_paths2['cefclient_bundle_resources_common'], \ + transfer_gypi_files(cef_dir, cef_paths2['cefclient_sources_renderer'], \ + 'tests/cefclient/', cefclient_dir, options.quiet) + transfer_gypi_files(cef_dir, cef_paths2['cefclient_sources_resources'], \ 'tests/cefclient/', cefclient_dir, options.quiet) # transfer common cefsimple files