diff --git a/BUILD.gn b/BUILD.gn index 0b136740..1d0333c9 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -198,6 +198,7 @@ group("cef") { # Configuration that will be applied to all targets that depend on # libcef_static. config("libcef_static_config") { + # CEF targets use includes relative to the CEF root directory. include_dirs = [ "." ] defines = [ "BUILDING_CEF_SHARED", @@ -863,14 +864,12 @@ static_library("libcef_static") { # libcef_dll_wrapper. config("libcef_dll_wrapper_config") { include_dirs = [ + # CEF sources use include paths relative to the CEF root directory. ".", - # Source files included in the binary distrib use include paths relative to - # the tests directory. - "tests", - # For generated include headers. + # CEF generates some header files that also need to be discoverable. + # They will be copied to the include/ directory in the binary distribution. "$root_out_dir/includes", ] - defines = [ "USING_CEF_SHARED" ] } # libcef_dll_wrapper target. @@ -884,6 +883,8 @@ static_library("libcef_dll_wrapper") { gypi_paths2.libcef_dll_wrapper_sources_common + gypi_paths.autogen_client_side + defines = [ "WRAPPING_CEF_SHARED" ] + configs += [ ":libcef_dll_wrapper_config" ] public_configs = [ ":libcef_dll_wrapper_config" ] } @@ -896,6 +897,7 @@ static_library("libcef_dll_wrapper") { if (is_win) { static_library("cef_sandbox") { sources = [ "libcef_dll/sandbox/sandbox_win.cc" ] + # CEF sources use include paths relative to the CEF root directory. include_dirs = [ "." ] deps = [ "//sandbox" ] } @@ -1301,112 +1303,6 @@ if (is_mac) { # Executable/app targets. # -# cef_unittests shared sources. -cef_unittests_sources = [ - "tests/cefclient/browser/client_app_browser.cc", - "tests/cefclient/browser/client_app_browser.h", - "tests/cefclient/browser/geometry_util.cc", - "tests/cefclient/browser/geometry_util.h", - "tests/cefclient/browser/main_message_loop.cc", - "tests/cefclient/browser/main_message_loop.h", - "tests/cefclient/browser/main_message_loop_external_pump.cc", - "tests/cefclient/browser/main_message_loop_external_pump.h", - "tests/cefclient/browser/main_message_loop_std.cc", - "tests/cefclient/browser/main_message_loop_std.h", - "tests/cefclient/browser/resource_util.h", - "tests/cefclient/browser/resource_util.cc", - "tests/cefclient/browser/resource_util.h", - "tests/cefclient/common/client_app.cc", - "tests/cefclient/common/client_app.h", - "tests/cefclient/common/client_app_other.cc", - "tests/cefclient/common/client_app_other.h", - "tests/cefclient/common/client_switches.cc", - "tests/cefclient/common/client_switches.h", - "tests/cefclient/renderer/client_app_renderer.cc", - "tests/cefclient/renderer/client_app_renderer.h", - "tests/cefclient/resources/osr_test.html", - "tests/cefclient/resources/pdf.html", - "tests/cefclient/resources/pdf.pdf", - "tests/cefclient/resources/window_icon.1x.png", - "tests/cefclient/resources/window_icon.1x.png", - "tests/unittests/browser_info_map_unittest.cc", - "tests/unittests/command_line_unittest.cc", - "tests/unittests/cookie_unittest.cc", - "tests/unittests/dialog_unittest.cc", - "tests/unittests/display_unittest.cc", - "tests/unittests/dom_unittest.cc", - "tests/unittests/download_unittest.cc", - "tests/unittests/draggable_regions_unittest.cc", - "tests/unittests/file_util.cc", - "tests/unittests/file_util.h", - "tests/unittests/file_util_unittest.cc", - "tests/unittests/frame_unittest.cc", - "tests/unittests/geolocation_unittest.cc", - "tests/unittests/image_unittest.cc", - "tests/unittests/image_util.cc", - "tests/unittests/image_util.h", - "tests/unittests/jsdialog_unittest.cc", - "tests/unittests/life_span_unittest.cc", - "tests/unittests/message_router_unittest.cc", - "tests/unittests/navigation_unittest.cc", - "tests/unittests/os_rendering_unittest.cc", - "tests/unittests/parser_unittest.cc", - "tests/unittests/plugin_unittest.cc", - "tests/unittests/preference_unittest.cc", - "tests/unittests/print_unittest.cc", - "tests/unittests/process_message_unittest.cc", - "tests/unittests/request_context_unittest.cc", - "tests/unittests/request_handler_unittest.cc", - "tests/unittests/request_unittest.cc", - "tests/unittests/resource_manager_unittest.cc", - "tests/unittests/routing_test_handler.cc", - "tests/unittests/routing_test_handler.h", - "tests/unittests/run_all_unittests.cc", - "tests/unittests/scheme_handler_unittest.cc", - "tests/unittests/scoped_temp_dir_unittest.cc", - "tests/unittests/stream_unittest.cc", - "tests/unittests/stream_resource_handler_unittest.cc", - "tests/unittests/string_unittest.cc", - "tests/unittests/client_app_delegates.cc", - "tests/unittests/task_unittest.cc", - "tests/unittests/test_handler.cc", - "tests/unittests/test_handler.h", - "tests/unittests/test_suite.cc", - "tests/unittests/test_suite.h", - "tests/unittests/test_util.cc", - "tests/unittests/test_util.h", - "tests/unittests/thread_helper.cc", - "tests/unittests/thread_helper.h", - "tests/unittests/thread_unittest.cc", - "tests/unittests/tracing_unittest.cc", - "tests/unittests/translator_unittest.cc", - "tests/unittests/urlrequest_unittest.cc", - "tests/unittests/v8_unittest.cc", - "tests/unittests/values_unittest.cc", - "tests/unittests/version_unittest.cc", - "tests/unittests/waitable_event_unittest.cc", - "tests/unittests/webui_unittest.cc", - "tests/unittests/xml_reader_unittest.cc", - "tests/unittests/zip_reader_unittest.cc", -] - -if (use_aura) { - cef_unittests_sources += [ - "tests/unittests/views/button_unittest.cc", - "tests/unittests/views/panel_unittest.cc", - "tests/unittests/views/scroll_view_unittest.cc", - "tests/unittests/views/test_window_delegate.cc", - "tests/unittests/views/test_window_delegate.h", - "tests/unittests/views/textfield_unittest.cc", - "tests/unittests/views/window_unittest.cc", - ] -} - -# cef_unittests shared deps. -cef_unittests_deps = [ - "//testing/gtest", -] - if (is_mac) { # Helper for generating the CEF app bundle. template("cef_app") { @@ -1516,7 +1412,8 @@ if (is_mac) { # bundle_data("cefclient_resources_bundle_data") { - sources = gypi_paths2.cefclient_sources_resources + [ + sources = gypi_paths2.shared_sources_resources + + gypi_paths2.cefclient_sources_resources + [ "tests/cefclient/resources/mac/cefclient.icns", ] @@ -1548,9 +1445,11 @@ if (is_mac) { helper_sources = gypi_paths2.includes_mac + gypi_paths2.includes_common + gypi_paths2.includes_wrapper + + gypi_paths2.shared_sources_common + + gypi_paths2.shared_sources_renderer + + gypi_paths2.shared_sources_mac_helper + gypi_paths2.cefclient_sources_common + - gypi_paths2.cefclient_sources_renderer + - gypi_paths2.cefclient_sources_mac_helper + gypi_paths2.cefclient_sources_renderer helper_deps = [ ":libcef_dll_wrapper", ] @@ -1559,6 +1458,9 @@ if (is_mac) { sources = gypi_paths2.includes_mac + gypi_paths2.includes_common + gypi_paths2.includes_wrapper + + gypi_paths2.shared_sources_browser + + gypi_paths2.shared_sources_common + + gypi_paths2.shared_sources_mac + gypi_paths2.cefclient_sources_browser + gypi_paths2.cefclient_sources_common + gypi_paths2.cefclient_sources_mac @@ -1636,71 +1538,62 @@ if (is_mac) { # cef_unittests app targets. # + bundle_data("cef_unittests_resources_bundle_data") { + sources = gypi_paths2.shared_sources_resources + [ + "tests/unittests/resources/mac/unittests.icns", + ] + + outputs = [ + "{{bundle_resources_dir}}/{{source_file_part}}", + ] + } + + bundle_data("cef_unittests_resources_bundle_data_english") { + sources = [ + "tests/unittests/resources/mac/English.lproj/InfoPlist.strings", + ] + + outputs = [ + "{{bundle_resources_dir}}/English.lproj/{{source_file_part}}", + ] + } + + mac_xib_bundle_data("cef_unittests_xibs") { + sources = [ + "tests/unittests/resources/mac/English.lproj/MainMenu.xib", + ] + + output_path = "{{bundle_resources_dir}}/English.lproj" + } + cef_app("cef_unittests") { testonly = true - helper_info_plist = "tests/cefclient/resources/mac/helper-Info.plist" - helper_sources = [ - "tests/cefclient/browser/resource_util.cc", - "tests/cefclient/browser/resource_util.h", - "tests/cefclient/browser/resource_util_mac.mm", - "tests/cefclient/browser/resource_util_posix.cc", - "tests/cefclient/common/client_app.cc", - "tests/cefclient/common/client_app.h", - "tests/cefclient/common/client_app_other.cc", - "tests/cefclient/common/client_app_other.h", - "tests/cefclient/common/client_switches.cc", - "tests/cefclient/common/client_switches.h", - "tests/cefclient/process_helper_mac.cc", - "tests/cefclient/renderer/client_app_renderer.cc", - "tests/cefclient/renderer/client_app_renderer.h", - "tests/unittests/client_app_delegates.cc", - "tests/unittests/cookie_unittest.cc", - "tests/unittests/dom_unittest.cc", - "tests/unittests/file_util.cc", - "tests/unittests/file_util.h", - "tests/unittests/frame_unittest.cc", - "tests/unittests/message_router_unittest.cc", - "tests/unittests/navigation_unittest.cc", - "tests/unittests/plugin_unittest.cc", - "tests/unittests/preference_unittest.cc", - "tests/unittests/process_message_unittest.cc", - "tests/unittests/request_handler_unittest.cc", - "tests/unittests/request_unittest.cc", - "tests/unittests/routing_test_handler.cc", - "tests/unittests/routing_test_handler.h", - "tests/unittests/scheme_handler_unittest.cc", - "tests/unittests/urlrequest_unittest.cc", - "tests/unittests/test_handler.cc", - "tests/unittests/test_handler.h", - "tests/unittests/test_suite.cc", - "tests/unittests/test_suite.h", - "tests/unittests/test_util.cc", - "tests/unittests/test_util.h", - "tests/unittests/thread_helper.cc", - "tests/unittests/thread_helper.h", - "tests/unittests/thread_unittest.cc", - "tests/unittests/tracing_unittest.cc", - "tests/unittests/v8_unittest.cc", - ] - helper_deps = cef_unittests_deps + [ + helper_info_plist = "tests/unittests/resources/mac/helper-Info.plist" + helper_sources = gypi_paths2.shared_sources_common + + gypi_paths2.shared_sources_renderer + + gypi_paths2.shared_sources_mac_helper + + gypi_paths2.unittests_sources_mac_helper + helper_deps = [ ":libcef_dll_wrapper", + "//testing/gtest", ] - info_plist = "tests/cefclient/resources/mac/Info.plist" - sources = cef_unittests_sources + [ - "tests/cefclient/browser/main_message_loop_external_pump_mac.mm", - "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", - ] - deps = cef_unittests_deps + [ - ":cefclient_resources_bundle_data", - ":cefclient_resources_bundle_data_english", - ":cefclient_xibs", + info_plist = "tests/unittests/resources/mac/Info.plist" + sources = gypi_paths2.includes_mac + + gypi_paths2.includes_common + + gypi_paths2.includes_wrapper + + gypi_paths2.shared_sources_browser + + gypi_paths2.shared_sources_common + + gypi_paths2.shared_sources_mac + + gypi_paths2.unittests_sources_common + + gypi_paths2.unittests_sources_mac + deps = [ + ":cef_unittests_resources_bundle_data", + ":cef_unittests_resources_bundle_data_english", + ":cef_unittests_xibs", ":libcef_dll_wrapper", + "//testing/gtest", ] libs = [ "AppKit.framework", @@ -1732,14 +1625,19 @@ if (is_mac) { if (is_linux) { copy("copy_cefclient_files") { - sources = gypi_paths2.cefclient_sources_resources - outputs = [ "${root_out_dir}/files/{{source_file_part}}" ] + sources = gypi_paths2.shared_sources_resources + + gypi_paths2.cefclient_sources_resources + outputs = [ "${root_out_dir}/cefclient_files/{{source_file_part}}" ] } } executable("cefclient") { sources = gypi_paths2.includes_common + gypi_paths2.includes_wrapper + + gypi_paths2.shared_sources_browser + + gypi_paths2.shared_sources_common + + gypi_paths2.shared_sources_renderer + + gypi_paths2.shared_sources_resources + gypi_paths2.cefclient_sources_browser + gypi_paths2.cefclient_sources_common + gypi_paths2.cefclient_sources_renderer + @@ -1753,6 +1651,7 @@ if (is_mac) { if (is_win) { sources += gypi_paths2.includes_win + + gypi_paths2.shared_sources_win + gypi_paths2.cefclient_sources_win # Set /SUBSYSTEM:WINDOWS. @@ -1784,6 +1683,7 @@ if (is_mac) { if (is_linux) { sources += gypi_paths2.includes_linux + + gypi_paths2.shared_sources_linux + gypi_paths2.cefclient_sources_linux deps += [ @@ -1867,26 +1767,36 @@ if (is_mac) { # # cef_unittests targets. # + + if (is_linux) { + copy("copy_cef_unittests_files") { + sources = gypi_paths2.shared_sources_resources + outputs = [ "${root_out_dir}/unittests_files/{{source_file_part}}" ] + } + } executable("cef_unittests") { testonly = true - sources = cef_unittests_sources + sources = gypi_paths2.includes_common + + gypi_paths2.includes_wrapper + + gypi_paths2.shared_sources_browser + + gypi_paths2.shared_sources_common + + gypi_paths2.shared_sources_renderer + + gypi_paths2.shared_sources_resources + + gypi_paths2.unittests_sources_common + + gypi_paths2.unittests_sources_views - deps = cef_unittests_deps + [ + deps = [ ":libcef", ":libcef_dll_wrapper", "//build/config/sanitizers:deps", + "//testing/gtest", ] if (is_win) { - sources += [ - "tests/cefclient/browser/main_message_loop_external_pump_win.cc", - "tests/cefclient/browser/resource_util_win.cc", - "tests/cefclient/browser/util_win.cc", - "tests/cefclient/browser/util_win.h", - "tests/cefclient/resources/win/cefclient.rc", - ] + sources += gypi_paths2.shared_sources_win + + gypi_paths2.unittests_sources_win defines = [ "CEF_USE_SANDBOX", @@ -1899,18 +1809,15 @@ if (is_mac) { } if (is_linux) { - sources += [ - "tests/cefclient/browser/main_message_loop_external_pump_linux.cc", - "tests/cefclient/browser/resource_util_linux.cc", - "tests/cefclient/browser/resource_util_posix.cc", - ] + sources += gypi_paths2.shared_sources_linux + + gypi_paths2.unittests_sources_linux libs = [ "X11", ] deps += [ - ":copy_cefclient_files", + ":copy_cef_unittests_files", ] } diff --git a/CMakeLists.txt.in b/CMakeLists.txt.in index 75b1a945..78fa16df 100644 --- a/CMakeLists.txt.in +++ b/CMakeLists.txt.in @@ -27,8 +27,7 @@ # CMakeLists.txt Bootstrap that sets up the CMake environment. # cmake/*.cmake CEF configuration files shared by all targets. # libcef_dll/CMakeLists.txt Defines the libcef_dll_wrapper target. -# cefclient/CMakeLists.txt Defines the cefclient target. -# cefsimple/CMakeLists.txt Defines the cefsimple target. +# tests/*/CMakeLists.txt Defines the test application target. # # See the "TODO:" comments below for guidance on how to integrate this CEF # binary distribution into a new or existing CMake project. @@ -200,8 +199,10 @@ add_subdirectory(${CEF_LIBCEF_DLL_WRAPPER_PATH} libcef_dll_wrapper) # Include application targets. # Comes from the /CMakeLists.txt file in the current directory. # TODO: Change these lines to match your project target when you copy this file. -add_subdirectory(cefclient) -add_subdirectory(cefsimple) +add_subdirectory(tests/cefclient) +add_subdirectory(tests/cefsimple) +add_subdirectory(tests/gtest) +add_subdirectory(tests/unittests) # Display configuration settings. PRINT_CEF_CONFIG() diff --git a/cef_paths2.gypi b/cef_paths2.gypi index 2985226b..a4c9a7d7 100644 --- a/cef_paths2.gypi +++ b/cef_paths2.gypi @@ -133,6 +133,58 @@ 'libcef_dll/wrapper/libcef_dll_wrapper.cc', 'libcef_dll/wrapper/libcef_dll_wrapper2.cc', ], + 'shared_sources_browser': [ + 'tests/shared/browser/client_app_browser.cc', + 'tests/shared/browser/client_app_browser.h', + 'tests/shared/browser/geometry_util.cc', + 'tests/shared/browser/geometry_util.h', + 'tests/shared/browser/main_message_loop.cc', + 'tests/shared/browser/main_message_loop.h', + 'tests/shared/browser/main_message_loop_external_pump.cc', + 'tests/shared/browser/main_message_loop_external_pump.h', + 'tests/shared/browser/main_message_loop_std.cc', + 'tests/shared/browser/main_message_loop_std.h', + 'tests/shared/browser/resource_util.h', + 'tests/shared/browser/resource_util.cc', + 'tests/shared/browser/resource_util.h', + ], + 'shared_sources_common': [ + 'tests/shared/common/client_app.cc', + 'tests/shared/common/client_app.h', + 'tests/shared/common/client_app_other.cc', + 'tests/shared/common/client_app_other.h', + 'tests/shared/common/client_switches.cc', + 'tests/shared/common/client_switches.h', + ], + 'shared_sources_renderer': [ + 'tests/shared/renderer/client_app_renderer.cc', + 'tests/shared/renderer/client_app_renderer.h', + ], + 'shared_sources_resources': [ + 'tests/shared/resources/osr_test.html', + 'tests/shared/resources/pdf.html', + 'tests/shared/resources/pdf.pdf', + 'tests/shared/resources/window_icon.1x.png', + 'tests/shared/resources/window_icon.2x.png', + ], + 'shared_sources_linux': [ + 'tests/shared/browser/main_message_loop_external_pump_linux.cc', + 'tests/shared/browser/resource_util_posix.cc', + ], + 'shared_sources_mac': [ + 'tests/shared/browser/main_message_loop_external_pump_mac.mm', + 'tests/shared/browser/resource_util_mac.mm', + 'tests/shared/browser/resource_util_posix.cc', + ], + 'shared_sources_mac_helper': [ + 'tests/shared/process_helper_mac.cc', + ], + 'shared_sources_win': [ + 'tests/shared/browser/main_message_loop_external_pump_win.cc', + 'tests/shared/browser/resource_util_win.cc', + 'tests/shared/browser/util_win.cc', + 'tests/shared/browser/util_win.h', + ], 'cefclient_sources_browser': [ 'tests/cefclient/browser/binding_test.cc', 'tests/cefclient/browser/binding_test.h', @@ -140,8 +192,6 @@ '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_browser.cc', - 'tests/cefclient/browser/client_app_browser.h', 'tests/cefclient/browser/client_app_delegates_browser.cc', 'tests/cefclient/browser/client_handler.cc', 'tests/cefclient/browser/client_handler.h', @@ -154,26 +204,16 @@ 'tests/cefclient/browser/dialog_test.h', 'tests/cefclient/browser/drm_test.cc', 'tests/cefclient/browser/drm_test.h', - 'tests/cefclient/browser/geometry_util.cc', - 'tests/cefclient/browser/geometry_util.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_external_pump.cc', - 'tests/cefclient/browser/main_message_loop_external_pump.h', - '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/preferences_test.cc', 'tests/cefclient/browser/preferences_test.h', 'tests/cefclient/browser/resource.h', - 'tests/cefclient/browser/resource_util.cc', - 'tests/cefclient/browser/resource_util.h', 'tests/cefclient/browser/response_filter_test.cc', 'tests/cefclient/browser/response_filter_test.h', 'tests/cefclient/browser/root_window.cc', @@ -194,20 +234,12 @@ 'tests/cefclient/browser/window_test_runner.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_app_other.cc', - 'tests/cefclient/common/client_app_other.h', - '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_app_renderer.cc', - 'tests/cefclient/renderer/client_app_renderer.h', 'tests/cefclient/renderer/client_renderer.cc', 'tests/cefclient/renderer/client_renderer.h', 'tests/cefclient/renderer/performance_test.cc', @@ -224,10 +256,7 @@ 'tests/cefclient/resources/logo.png', 'tests/cefclient/resources/menu_icon.1x.png', 'tests/cefclient/resources/menu_icon.2x.png', - 'tests/cefclient/resources/osr_test.html', 'tests/cefclient/resources/other_tests.html', - 'tests/cefclient/resources/pdf.html', - 'tests/cefclient/resources/pdf.pdf', 'tests/cefclient/resources/performance.html', 'tests/cefclient/resources/performance2.html', 'tests/cefclient/resources/preferences.html', @@ -235,8 +264,6 @@ 'tests/cefclient/resources/transparency.html', 'tests/cefclient/resources/urlrequest.html', 'tests/cefclient/resources/window.html', - 'tests/cefclient/resources/window_icon.1x.png', - 'tests/cefclient/resources/window_icon.2x.png', 'tests/cefclient/resources/xmlhttprequest.html', ], 'cefclient_sources_win': [ @@ -245,7 +272,6 @@ 'tests/cefclient/browser/browser_window_std_win.cc', 'tests/cefclient/browser/browser_window_std_win.h', 'tests/cefclient/browser/main_context_impl_win.cc', - 'tests/cefclient/browser/main_message_loop_external_pump_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', @@ -254,15 +280,13 @@ 'tests/cefclient/browser/osr_ime_handler_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/resource_util_win_idmap.cc', 'tests/cefclient/browser/root_window_views.cc', 'tests/cefclient/browser/root_window_views.h', '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/views_window.cc', 'tests/cefclient/browser/views_window.h', 'tests/cefclient/browser/window_test_runner_views.cc', @@ -281,9 +305,6 @@ 'tests/cefclient/browser/browser_window_std_mac.h', 'tests/cefclient/browser/browser_window_std_mac.mm', 'tests/cefclient/browser/main_context_impl_posix.cc', - 'tests/cefclient/browser/main_message_loop_external_pump_mac.mm', - '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', @@ -294,9 +315,6 @@ 'tests/cefclient/browser/window_test_runner_mac.mm', 'tests/cefclient/cefclient_mac.mm', ], - 'cefclient_sources_mac_helper': [ - 'tests/cefclient/process_helper_mac.cc', - ], 'cefclient_bundle_resources_mac': [ 'tests/cefclient/resources/mac/cefclient.icns', 'tests/cefclient/resources/mac/English.lproj/InfoPlist.strings', @@ -311,11 +329,9 @@ '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/main_message_loop_external_pump_linux.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/root_window_views.cc', @@ -362,5 +378,131 @@ 'tests/cefsimple/cefsimple_linux.cc', 'tests/cefsimple/simple_handler_linux.cc', ], + 'unittests_sources_common': [ + 'tests/unittests/browser_info_map_unittest.cc', + 'tests/unittests/command_line_unittest.cc', + 'tests/unittests/cookie_unittest.cc', + 'tests/unittests/dialog_unittest.cc', + 'tests/unittests/display_unittest.cc', + 'tests/unittests/dom_unittest.cc', + 'tests/unittests/download_unittest.cc', + 'tests/unittests/draggable_regions_unittest.cc', + 'tests/unittests/file_util.cc', + 'tests/unittests/file_util.h', + 'tests/unittests/file_util_unittest.cc', + 'tests/unittests/frame_unittest.cc', + 'tests/unittests/geolocation_unittest.cc', + 'tests/unittests/image_unittest.cc', + 'tests/unittests/image_util.cc', + 'tests/unittests/image_util.h', + 'tests/unittests/jsdialog_unittest.cc', + 'tests/unittests/life_span_unittest.cc', + 'tests/unittests/message_router_unittest.cc', + 'tests/unittests/navigation_unittest.cc', + 'tests/unittests/os_rendering_unittest.cc', + 'tests/unittests/parser_unittest.cc', + 'tests/unittests/plugin_unittest.cc', + 'tests/unittests/preference_unittest.cc', + 'tests/unittests/print_unittest.cc', + 'tests/unittests/process_message_unittest.cc', + 'tests/unittests/request_context_unittest.cc', + 'tests/unittests/request_handler_unittest.cc', + 'tests/unittests/request_unittest.cc', + 'tests/unittests/resource.h', + 'tests/unittests/resource_manager_unittest.cc', + 'tests/unittests/routing_test_handler.cc', + 'tests/unittests/routing_test_handler.h', + 'tests/unittests/run_all_unittests.cc', + 'tests/unittests/scheme_handler_unittest.cc', + 'tests/unittests/scoped_temp_dir_unittest.cc', + 'tests/unittests/stream_unittest.cc', + 'tests/unittests/stream_resource_handler_unittest.cc', + 'tests/unittests/string_unittest.cc', + 'tests/unittests/client_app_delegates.cc', + 'tests/unittests/task_unittest.cc', + 'tests/unittests/test_handler.cc', + 'tests/unittests/test_handler.h', + 'tests/unittests/test_suite.cc', + 'tests/unittests/test_suite.h', + 'tests/unittests/test_util.cc', + 'tests/unittests/test_util.h', + 'tests/unittests/thread_helper.cc', + 'tests/unittests/thread_helper.h', + 'tests/unittests/thread_unittest.cc', + 'tests/unittests/tracing_unittest.cc', + 'tests/unittests/translator_unittest.cc', + 'tests/unittests/urlrequest_unittest.cc', + 'tests/unittests/v8_unittest.cc', + 'tests/unittests/values_unittest.cc', + 'tests/unittests/version_unittest.cc', + 'tests/unittests/waitable_event_unittest.cc', + 'tests/unittests/webui_unittest.cc', + 'tests/unittests/xml_reader_unittest.cc', + 'tests/unittests/zip_reader_unittest.cc', + ], + 'unittests_sources_views': [ + 'tests/unittests/views/button_unittest.cc', + 'tests/unittests/views/panel_unittest.cc', + 'tests/unittests/views/scroll_view_unittest.cc', + 'tests/unittests/views/test_window_delegate.cc', + 'tests/unittests/views/test_window_delegate.h', + 'tests/unittests/views/textfield_unittest.cc', + 'tests/unittests/views/window_unittest.cc', + ], + 'unittests_sources_win': [ + 'tests/unittests/resource_util_win_idmap.cc', + 'tests/unittests/resources/win/cef_unittests.exe.manifest', + 'tests/unittests/resources/win/unittests.ico', + 'tests/unittests/resources/win/unittests.rc', + 'tests/unittests/resources/win/small.ico', + ], + 'unittests_sources_mac': [ + 'tests/unittests/os_rendering_unittest_mac.h', + 'tests/unittests/os_rendering_unittest_mac.mm', + 'tests/unittests/run_all_unittests_mac.mm', + ], + 'unittests_sources_mac_helper': [ + 'tests/shared/browser/resource_util.cc', + 'tests/shared/browser/resource_util.h', + 'tests/shared/browser/resource_util_mac.mm', + 'tests/shared/browser/resource_util_posix.cc', + 'tests/unittests/client_app_delegates.cc', + 'tests/unittests/cookie_unittest.cc', + 'tests/unittests/dom_unittest.cc', + 'tests/unittests/file_util.cc', + 'tests/unittests/file_util.h', + 'tests/unittests/frame_unittest.cc', + 'tests/unittests/message_router_unittest.cc', + 'tests/unittests/navigation_unittest.cc', + 'tests/unittests/plugin_unittest.cc', + 'tests/unittests/preference_unittest.cc', + 'tests/unittests/process_message_unittest.cc', + 'tests/unittests/request_handler_unittest.cc', + 'tests/unittests/request_unittest.cc', + 'tests/unittests/routing_test_handler.cc', + 'tests/unittests/routing_test_handler.h', + 'tests/unittests/scheme_handler_unittest.cc', + 'tests/unittests/urlrequest_unittest.cc', + 'tests/unittests/test_handler.cc', + 'tests/unittests/test_handler.h', + 'tests/unittests/test_suite.cc', + 'tests/unittests/test_suite.h', + 'tests/unittests/test_util.cc', + 'tests/unittests/test_util.h', + 'tests/unittests/thread_helper.cc', + 'tests/unittests/thread_helper.h', + 'tests/unittests/thread_unittest.cc', + 'tests/unittests/tracing_unittest.cc', + 'tests/unittests/v8_unittest.cc', + ], + 'unittests_bundle_resources_mac': [ + 'tests/unittests/resources/mac/unittests.icns', + 'tests/unittests/resources/mac/English.lproj/InfoPlist.strings', + 'tests/unittests/resources/mac/English.lproj/MainMenu.xib', + 'tests/unittests/resources/mac/Info.plist', + ], + 'unittests_sources_linux': [ + 'tests/unittests/resource_util_linux.cc', + ], }, } diff --git a/cmake/cef_macros.cmake.in b/cmake/cef_macros.cmake.in index d6b853a8..6daa9fbe 100644 --- a/cmake/cef_macros.cmake.in +++ b/cmake/cef_macros.cmake.in @@ -96,10 +96,12 @@ macro(SET_CEF_TARGET_OUT_DIR) endmacro() # Copy a list of files from one directory to another. Relative files paths are maintained. +# The path component of the source |file_list| will be removed. macro(COPY_FILES target file_list source_dir target_dir) foreach(FILENAME ${file_list}) set(source_file ${source_dir}/${FILENAME}) - set(target_file ${target_dir}/${FILENAME}) + get_filename_component(target_name ${FILENAME} NAME) + set(target_file ${target_dir}/${target_name}) if(IS_DIRECTORY ${source_file}) add_custom_command( TARGET ${target} @@ -118,19 +120,6 @@ macro(COPY_FILES target file_list source_dir target_dir) endforeach() endmacro() -# Rename a directory replacing the target if it already exists. -macro(RENAME_DIRECTORY target source_dir target_dir) - add_custom_command( - TARGET ${target} - POST_BUILD - # Remove the target directory if it already exists. - COMMAND ${CMAKE_COMMAND} -E remove_directory "${target_dir}" - # Rename the source directory to target directory. - COMMAND ${CMAKE_COMMAND} -E rename "${source_dir}" "${target_dir}" - VERBATIM - ) -endmacro() - # # Linux macros. diff --git a/cmake/cef_variables.cmake.in b/cmake/cef_variables.cmake.in index 72a2f715..db19b6ff 100644 --- a/cmake/cef_variables.cmake.in +++ b/cmake/cef_variables.cmake.in @@ -411,6 +411,7 @@ if(OS_WINDOWS) # List of CEF binary files. set(CEF_BINARY_FILES + chrome_elf.dll d3dcompiler_43.dll d3dcompiler_47.dll libcef.dll diff --git a/include/capi/test/cef_translator_test_capi.h b/include/capi/test/cef_translator_test_capi.h index d68b86c7..10904de0 100644 --- a/include/capi/test/cef_translator_test_capi.h +++ b/include/capi/test/cef_translator_test_capi.h @@ -38,6 +38,11 @@ #define CEF_INCLUDE_CAPI_TEST_CEF_TRANSLATOR_TEST_CAPI_H_ #pragma once +#if !defined(BUILDING_CEF_SHARED) && !defined(WRAPPING_CEF_SHARED) && \ + !defined(UNIT_TEST) +#error This file can be included for unit tests only +#endif + #include "include/capi/cef_base_capi.h" #ifdef __cplusplus diff --git a/include/test/cef_translator_test.h b/include/test/cef_translator_test.h index 5357cc91..c9398dad 100644 --- a/include/test/cef_translator_test.h +++ b/include/test/cef_translator_test.h @@ -35,16 +35,19 @@ // // THIS FILE IS FOR TESTING PURPOSES ONLY. // -// The APIs defined in this file are for testing purposes only. They will not be -// exposed via the binary distribution. All classes in this file must include -// the 'no_debugct_check' attribute to avoid problems when building the binary -// distribution. +// The APIs defined in this file are for testing purposes only. They should only +// be included from unit test targets. // #ifndef CEF_INCLUDE_TEST_CEF_TEST_H_ #define CEF_INCLUDE_TEST_CEF_TEST_H_ #pragma once +#if !defined(BUILDING_CEF_SHARED) && !defined(WRAPPING_CEF_SHARED) && \ + !defined(UNIT_TEST) +#error This file can be included for unit tests only +#endif + #include #include diff --git a/libcef_dll/CMakeLists.txt.in b/libcef_dll/CMakeLists.txt.in index 9dbdad80..045e9a75 100644 --- a/libcef_dll/CMakeLists.txt.in +++ b/libcef_dll/CMakeLists.txt.in @@ -2,8 +2,6 @@ # reserved. Use of this source code is governed by a BSD-style license that # can be found in the LICENSE file. -add_definitions(-DUSING_CEF_SHARED) - # Append platform specific sources to a list of sources. macro(LIBCEF_APPEND_PLATFORM_SOURCES name_of_list) if("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin" AND ${name_of_list}_MACOSX) @@ -17,9 +15,11 @@ macro(LIBCEF_APPEND_PLATFORM_SOURCES name_of_list) endif() endmacro() +set(CEF_TARGET libcef_dll_wrapper) + {{ 'prefix': 'libcef', - 'library': 'libcef_dll_wrapper', + 'library': '${CEF_TARGET}', 'append_macro': 'LIBCEF_APPEND_PLATFORM_SOURCES', 'includes': [ 'includes_common', @@ -35,7 +35,10 @@ endmacro() 'autogen_client_side', ], }} -SET_LIBRARY_TARGET_PROPERTIES(libcef_dll_wrapper) +SET_LIBRARY_TARGET_PROPERTIES(${CEF_TARGET}) + +# Creating the CEF wrapper library. Do not define this for dependent targets. +target_compile_definitions(${CEF_TARGET} PRIVATE -DWRAPPING_CEF_SHARED) # Remove the default "lib" prefix from the resulting library. -set_target_properties(libcef_dll_wrapper PROPERTIES PREFIX "") +set_target_properties(${CEF_TARGET} PROPERTIES PREFIX "") diff --git a/libcef_dll/cpptoc/app_cpptoc.h b/libcef_dll/cpptoc/app_cpptoc.h index 55026694..19ae3def 100644 --- a/libcef_dll/cpptoc/app_cpptoc.h +++ b/libcef_dll/cpptoc/app_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_APP_CPPTOC_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/cef_app.h" #include "include/capi/cef_app_capi.h" @@ -30,5 +30,4 @@ class CefAppCppToC CefAppCppToC(); }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_APP_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/auth_callback_cpptoc.h b/libcef_dll/cpptoc/auth_callback_cpptoc.h index 32c661c6..689d8242 100644 --- a/libcef_dll/cpptoc/auth_callback_cpptoc.h +++ b/libcef_dll/cpptoc/auth_callback_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_AUTH_CALLBACK_CPPTOC_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/cef_auth_callback.h" #include "include/capi/cef_auth_callback_capi.h" @@ -31,5 +31,4 @@ class CefAuthCallbackCppToC CefAuthCallbackCppToC(); }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_AUTH_CALLBACK_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/base_cpptoc.h b/libcef_dll/cpptoc/base_cpptoc.h index c8c00b62..8be2681b 100644 --- a/libcef_dll/cpptoc/base_cpptoc.h +++ b/libcef_dll/cpptoc/base_cpptoc.h @@ -10,9 +10,9 @@ #include "include/capi/cef_base_capi.h" #include "libcef_dll/cpptoc/cpptoc.h" -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif // Wrap a C++ class with a C structure. class CefBaseCppToC @@ -21,5 +21,4 @@ class CefBaseCppToC CefBaseCppToC(); }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_BASE_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/before_download_callback_cpptoc.h b/libcef_dll/cpptoc/before_download_callback_cpptoc.h index 7a42b4b8..60d85bb2 100644 --- a/libcef_dll/cpptoc/before_download_callback_cpptoc.h +++ b/libcef_dll/cpptoc/before_download_callback_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_BEFORE_DOWNLOAD_CALLBACK_CPPTOC_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/cef_download_handler.h" #include "include/capi/cef_download_handler_capi.h" @@ -31,5 +31,4 @@ class CefBeforeDownloadCallbackCppToC CefBeforeDownloadCallbackCppToC(); }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_BEFORE_DOWNLOAD_CALLBACK_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/binary_value_cpptoc.h b/libcef_dll/cpptoc/binary_value_cpptoc.h index 38feeb21..e4e6f00b 100644 --- a/libcef_dll/cpptoc/binary_value_cpptoc.h +++ b/libcef_dll/cpptoc/binary_value_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_BINARY_VALUE_CPPTOC_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/cef_values.h" #include "include/capi/cef_values_capi.h" @@ -31,5 +31,4 @@ class CefBinaryValueCppToC CefBinaryValueCppToC(); }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_BINARY_VALUE_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/browser_cpptoc.h b/libcef_dll/cpptoc/browser_cpptoc.h index 92b55465..ecf8caf8 100644 --- a/libcef_dll/cpptoc/browser_cpptoc.h +++ b/libcef_dll/cpptoc/browser_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_BROWSER_CPPTOC_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/cef_browser.h" #include "include/capi/cef_browser_capi.h" @@ -32,5 +32,4 @@ class CefBrowserCppToC CefBrowserCppToC(); }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_BROWSER_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/browser_host_cpptoc.h b/libcef_dll/cpptoc/browser_host_cpptoc.h index 54bf32e8..42347575 100644 --- a/libcef_dll/cpptoc/browser_host_cpptoc.h +++ b/libcef_dll/cpptoc/browser_host_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_BROWSER_HOST_CPPTOC_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/cef_browser.h" #include "include/capi/cef_browser_capi.h" @@ -33,5 +33,4 @@ class CefBrowserHostCppToC CefBrowserHostCppToC(); }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_BROWSER_HOST_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/browser_process_handler_cpptoc.h b/libcef_dll/cpptoc/browser_process_handler_cpptoc.h index 725ca287..4f73ab0d 100644 --- a/libcef_dll/cpptoc/browser_process_handler_cpptoc.h +++ b/libcef_dll/cpptoc/browser_process_handler_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_BROWSER_PROCESS_HANDLER_CPPTOC_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/cef_browser_process_handler.h" #include "include/capi/cef_browser_process_handler_capi.h" @@ -31,5 +31,4 @@ class CefBrowserProcessHandlerCppToC CefBrowserProcessHandlerCppToC(); }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_BROWSER_PROCESS_HANDLER_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/callback_cpptoc.h b/libcef_dll/cpptoc/callback_cpptoc.h index dd3ac066..5003e6b8 100644 --- a/libcef_dll/cpptoc/callback_cpptoc.h +++ b/libcef_dll/cpptoc/callback_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_CALLBACK_CPPTOC_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/cef_callback.h" #include "include/capi/cef_callback_capi.h" @@ -30,5 +30,4 @@ class CefCallbackCppToC CefCallbackCppToC(); }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_CALLBACK_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/client_cpptoc.h b/libcef_dll/cpptoc/client_cpptoc.h index f06ce377..ad8339d6 100644 --- a/libcef_dll/cpptoc/client_cpptoc.h +++ b/libcef_dll/cpptoc/client_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_CLIENT_CPPTOC_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/cef_client.h" #include "include/capi/cef_client_capi.h" @@ -30,5 +30,4 @@ class CefClientCppToC CefClientCppToC(); }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_CLIENT_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/command_line_cpptoc.h b/libcef_dll/cpptoc/command_line_cpptoc.h index d776fea6..29f0cb48 100644 --- a/libcef_dll/cpptoc/command_line_cpptoc.h +++ b/libcef_dll/cpptoc/command_line_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_COMMAND_LINE_CPPTOC_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/cef_command_line.h" #include "include/capi/cef_command_line_capi.h" @@ -31,5 +31,4 @@ class CefCommandLineCppToC CefCommandLineCppToC(); }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_COMMAND_LINE_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/completion_callback_cpptoc.h b/libcef_dll/cpptoc/completion_callback_cpptoc.h index bc06373d..83b6b0e6 100644 --- a/libcef_dll/cpptoc/completion_callback_cpptoc.h +++ b/libcef_dll/cpptoc/completion_callback_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_COMPLETION_CALLBACK_CPPTOC_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/cef_callback.h" #include "include/capi/cef_callback_capi.h" @@ -31,5 +31,4 @@ class CefCompletionCallbackCppToC CefCompletionCallbackCppToC(); }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_COMPLETION_CALLBACK_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/context_menu_handler_cpptoc.h b/libcef_dll/cpptoc/context_menu_handler_cpptoc.h index fa2ffbf6..ff64b56e 100644 --- a/libcef_dll/cpptoc/context_menu_handler_cpptoc.h +++ b/libcef_dll/cpptoc/context_menu_handler_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_CONTEXT_MENU_HANDLER_CPPTOC_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/cef_context_menu_handler.h" #include "include/capi/cef_context_menu_handler_capi.h" @@ -31,5 +31,4 @@ class CefContextMenuHandlerCppToC CefContextMenuHandlerCppToC(); }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_CONTEXT_MENU_HANDLER_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/context_menu_params_cpptoc.h b/libcef_dll/cpptoc/context_menu_params_cpptoc.h index 78db505b..f8f62cbc 100644 --- a/libcef_dll/cpptoc/context_menu_params_cpptoc.h +++ b/libcef_dll/cpptoc/context_menu_params_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_CONTEXT_MENU_PARAMS_CPPTOC_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/cef_context_menu_handler.h" #include "include/capi/cef_context_menu_handler_capi.h" @@ -31,5 +31,4 @@ class CefContextMenuParamsCppToC CefContextMenuParamsCppToC(); }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_CONTEXT_MENU_PARAMS_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/cookie_manager_cpptoc.h b/libcef_dll/cpptoc/cookie_manager_cpptoc.h index 05d809df..f6cf4a2a 100644 --- a/libcef_dll/cpptoc/cookie_manager_cpptoc.h +++ b/libcef_dll/cpptoc/cookie_manager_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_COOKIE_MANAGER_CPPTOC_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/cef_cookie.h" #include "include/capi/cef_cookie_capi.h" @@ -31,5 +31,4 @@ class CefCookieManagerCppToC CefCookieManagerCppToC(); }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_COOKIE_MANAGER_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/cookie_visitor_cpptoc.h b/libcef_dll/cpptoc/cookie_visitor_cpptoc.h index 7e12965c..21bf78d0 100644 --- a/libcef_dll/cpptoc/cookie_visitor_cpptoc.h +++ b/libcef_dll/cpptoc/cookie_visitor_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_COOKIE_VISITOR_CPPTOC_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/cef_cookie.h" #include "include/capi/cef_cookie_capi.h" @@ -31,5 +31,4 @@ class CefCookieVisitorCppToC CefCookieVisitorCppToC(); }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_COOKIE_VISITOR_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/delete_cookies_callback_cpptoc.h b/libcef_dll/cpptoc/delete_cookies_callback_cpptoc.h index 52f7b8d7..5c7ed793 100644 --- a/libcef_dll/cpptoc/delete_cookies_callback_cpptoc.h +++ b/libcef_dll/cpptoc/delete_cookies_callback_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_DELETE_COOKIES_CALLBACK_CPPTOC_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/cef_cookie.h" #include "include/capi/cef_cookie_capi.h" @@ -31,5 +31,4 @@ class CefDeleteCookiesCallbackCppToC CefDeleteCookiesCallbackCppToC(); }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_DELETE_COOKIES_CALLBACK_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/dialog_handler_cpptoc.h b/libcef_dll/cpptoc/dialog_handler_cpptoc.h index e9c6fbb8..b826743e 100644 --- a/libcef_dll/cpptoc/dialog_handler_cpptoc.h +++ b/libcef_dll/cpptoc/dialog_handler_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_DIALOG_HANDLER_CPPTOC_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/cef_dialog_handler.h" #include "include/capi/cef_dialog_handler_capi.h" @@ -31,5 +31,4 @@ class CefDialogHandlerCppToC CefDialogHandlerCppToC(); }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_DIALOG_HANDLER_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/dictionary_value_cpptoc.h b/libcef_dll/cpptoc/dictionary_value_cpptoc.h index d6b27e8e..6d341adc 100644 --- a/libcef_dll/cpptoc/dictionary_value_cpptoc.h +++ b/libcef_dll/cpptoc/dictionary_value_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_DICTIONARY_VALUE_CPPTOC_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/cef_values.h" #include "include/capi/cef_values_capi.h" @@ -31,5 +31,4 @@ class CefDictionaryValueCppToC CefDictionaryValueCppToC(); }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_DICTIONARY_VALUE_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/display_handler_cpptoc.h b/libcef_dll/cpptoc/display_handler_cpptoc.h index 6798edd2..af0c7649 100644 --- a/libcef_dll/cpptoc/display_handler_cpptoc.h +++ b/libcef_dll/cpptoc/display_handler_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_DISPLAY_HANDLER_CPPTOC_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/cef_display_handler.h" #include "include/capi/cef_display_handler_capi.h" @@ -31,5 +31,4 @@ class CefDisplayHandlerCppToC CefDisplayHandlerCppToC(); }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_DISPLAY_HANDLER_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/domdocument_cpptoc.h b/libcef_dll/cpptoc/domdocument_cpptoc.h index 40de9ea7..3b061623 100644 --- a/libcef_dll/cpptoc/domdocument_cpptoc.h +++ b/libcef_dll/cpptoc/domdocument_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_DOMDOCUMENT_CPPTOC_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/cef_dom.h" #include "include/capi/cef_dom_capi.h" @@ -31,5 +31,4 @@ class CefDOMDocumentCppToC CefDOMDocumentCppToC(); }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_DOMDOCUMENT_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/domnode_cpptoc.h b/libcef_dll/cpptoc/domnode_cpptoc.h index 30ede821..94c8116e 100644 --- a/libcef_dll/cpptoc/domnode_cpptoc.h +++ b/libcef_dll/cpptoc/domnode_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_DOMNODE_CPPTOC_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/cef_dom.h" #include "include/capi/cef_dom_capi.h" @@ -30,5 +30,4 @@ class CefDOMNodeCppToC CefDOMNodeCppToC(); }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_DOMNODE_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/domvisitor_cpptoc.h b/libcef_dll/cpptoc/domvisitor_cpptoc.h index 82707117..cd4e3e94 100644 --- a/libcef_dll/cpptoc/domvisitor_cpptoc.h +++ b/libcef_dll/cpptoc/domvisitor_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_DOMVISITOR_CPPTOC_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/cef_dom.h" #include "include/capi/cef_dom_capi.h" @@ -30,5 +30,4 @@ class CefDOMVisitorCppToC CefDOMVisitorCppToC(); }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_DOMVISITOR_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/download_handler_cpptoc.h b/libcef_dll/cpptoc/download_handler_cpptoc.h index 412ca7ae..6e3852f6 100644 --- a/libcef_dll/cpptoc/download_handler_cpptoc.h +++ b/libcef_dll/cpptoc/download_handler_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_DOWNLOAD_HANDLER_CPPTOC_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/cef_download_handler.h" #include "include/capi/cef_download_handler_capi.h" @@ -31,5 +31,4 @@ class CefDownloadHandlerCppToC CefDownloadHandlerCppToC(); }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_DOWNLOAD_HANDLER_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/download_image_callback_cpptoc.h b/libcef_dll/cpptoc/download_image_callback_cpptoc.h index d053e9a7..76a9da14 100644 --- a/libcef_dll/cpptoc/download_image_callback_cpptoc.h +++ b/libcef_dll/cpptoc/download_image_callback_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_DOWNLOAD_IMAGE_CALLBACK_CPPTOC_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/cef_browser.h" #include "include/capi/cef_browser_capi.h" @@ -33,5 +33,4 @@ class CefDownloadImageCallbackCppToC CefDownloadImageCallbackCppToC(); }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_DOWNLOAD_IMAGE_CALLBACK_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/download_item_callback_cpptoc.h b/libcef_dll/cpptoc/download_item_callback_cpptoc.h index ea61bc00..d4e675f3 100644 --- a/libcef_dll/cpptoc/download_item_callback_cpptoc.h +++ b/libcef_dll/cpptoc/download_item_callback_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_DOWNLOAD_ITEM_CALLBACK_CPPTOC_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/cef_download_handler.h" #include "include/capi/cef_download_handler_capi.h" @@ -31,5 +31,4 @@ class CefDownloadItemCallbackCppToC CefDownloadItemCallbackCppToC(); }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_DOWNLOAD_ITEM_CALLBACK_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/download_item_cpptoc.h b/libcef_dll/cpptoc/download_item_cpptoc.h index 11418b2e..a666a396 100644 --- a/libcef_dll/cpptoc/download_item_cpptoc.h +++ b/libcef_dll/cpptoc/download_item_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_DOWNLOAD_ITEM_CPPTOC_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/cef_download_item.h" #include "include/capi/cef_download_item_capi.h" @@ -31,5 +31,4 @@ class CefDownloadItemCppToC CefDownloadItemCppToC(); }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_DOWNLOAD_ITEM_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/drag_data_cpptoc.h b/libcef_dll/cpptoc/drag_data_cpptoc.h index 10443af0..7380e6ec 100644 --- a/libcef_dll/cpptoc/drag_data_cpptoc.h +++ b/libcef_dll/cpptoc/drag_data_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_DRAG_DATA_CPPTOC_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/cef_drag_data.h" #include "include/capi/cef_drag_data_capi.h" @@ -30,5 +30,4 @@ class CefDragDataCppToC CefDragDataCppToC(); }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_DRAG_DATA_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/drag_handler_cpptoc.h b/libcef_dll/cpptoc/drag_handler_cpptoc.h index f51d1bc7..84efdf8e 100644 --- a/libcef_dll/cpptoc/drag_handler_cpptoc.h +++ b/libcef_dll/cpptoc/drag_handler_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_DRAG_HANDLER_CPPTOC_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/cef_drag_handler.h" #include "include/capi/cef_drag_handler_capi.h" @@ -31,5 +31,4 @@ class CefDragHandlerCppToC CefDragHandlerCppToC(); }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_DRAG_HANDLER_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/end_tracing_callback_cpptoc.h b/libcef_dll/cpptoc/end_tracing_callback_cpptoc.h index b731fedd..52b7b116 100644 --- a/libcef_dll/cpptoc/end_tracing_callback_cpptoc.h +++ b/libcef_dll/cpptoc/end_tracing_callback_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_END_TRACING_CALLBACK_CPPTOC_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/cef_trace.h" #include "include/capi/cef_trace_capi.h" @@ -31,5 +31,4 @@ class CefEndTracingCallbackCppToC CefEndTracingCallbackCppToC(); }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_END_TRACING_CALLBACK_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/file_dialog_callback_cpptoc.h b/libcef_dll/cpptoc/file_dialog_callback_cpptoc.h index 16e504b8..85f12a6e 100644 --- a/libcef_dll/cpptoc/file_dialog_callback_cpptoc.h +++ b/libcef_dll/cpptoc/file_dialog_callback_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_FILE_DIALOG_CALLBACK_CPPTOC_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/cef_dialog_handler.h" #include "include/capi/cef_dialog_handler_capi.h" @@ -31,5 +31,4 @@ class CefFileDialogCallbackCppToC CefFileDialogCallbackCppToC(); }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_FILE_DIALOG_CALLBACK_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/find_handler_cpptoc.h b/libcef_dll/cpptoc/find_handler_cpptoc.h index b10309ef..c787599e 100644 --- a/libcef_dll/cpptoc/find_handler_cpptoc.h +++ b/libcef_dll/cpptoc/find_handler_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_FIND_HANDLER_CPPTOC_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/cef_find_handler.h" #include "include/capi/cef_find_handler_capi.h" @@ -31,5 +31,4 @@ class CefFindHandlerCppToC CefFindHandlerCppToC(); }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_FIND_HANDLER_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/focus_handler_cpptoc.h b/libcef_dll/cpptoc/focus_handler_cpptoc.h index a8ebf7ec..0b52bd7b 100644 --- a/libcef_dll/cpptoc/focus_handler_cpptoc.h +++ b/libcef_dll/cpptoc/focus_handler_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_FOCUS_HANDLER_CPPTOC_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/cef_focus_handler.h" #include "include/capi/cef_focus_handler_capi.h" @@ -31,5 +31,4 @@ class CefFocusHandlerCppToC CefFocusHandlerCppToC(); }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_FOCUS_HANDLER_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/frame_cpptoc.h b/libcef_dll/cpptoc/frame_cpptoc.h index 4399b9d1..329a0882 100644 --- a/libcef_dll/cpptoc/frame_cpptoc.h +++ b/libcef_dll/cpptoc/frame_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_FRAME_CPPTOC_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/cef_frame.h" #include "include/capi/cef_frame_capi.h" @@ -34,5 +34,4 @@ class CefFrameCppToC CefFrameCppToC(); }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_FRAME_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/geolocation_callback_cpptoc.h b/libcef_dll/cpptoc/geolocation_callback_cpptoc.h index c8d07432..8488e8f6 100644 --- a/libcef_dll/cpptoc/geolocation_callback_cpptoc.h +++ b/libcef_dll/cpptoc/geolocation_callback_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_GEOLOCATION_CALLBACK_CPPTOC_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/cef_geolocation_handler.h" #include "include/capi/cef_geolocation_handler_capi.h" @@ -31,5 +31,4 @@ class CefGeolocationCallbackCppToC CefGeolocationCallbackCppToC(); }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_GEOLOCATION_CALLBACK_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/geolocation_handler_cpptoc.h b/libcef_dll/cpptoc/geolocation_handler_cpptoc.h index 16463b85..32add15f 100644 --- a/libcef_dll/cpptoc/geolocation_handler_cpptoc.h +++ b/libcef_dll/cpptoc/geolocation_handler_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_GEOLOCATION_HANDLER_CPPTOC_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/cef_geolocation_handler.h" #include "include/capi/cef_geolocation_handler_capi.h" @@ -31,5 +31,4 @@ class CefGeolocationHandlerCppToC CefGeolocationHandlerCppToC(); }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_GEOLOCATION_HANDLER_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/get_geolocation_callback_cpptoc.h b/libcef_dll/cpptoc/get_geolocation_callback_cpptoc.h index 069a505e..a3dd6130 100644 --- a/libcef_dll/cpptoc/get_geolocation_callback_cpptoc.h +++ b/libcef_dll/cpptoc/get_geolocation_callback_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_GET_GEOLOCATION_CALLBACK_CPPTOC_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/cef_geolocation.h" #include "include/capi/cef_geolocation_capi.h" @@ -31,5 +31,4 @@ class CefGetGeolocationCallbackCppToC CefGetGeolocationCallbackCppToC(); }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_GET_GEOLOCATION_CALLBACK_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/image_cpptoc.h b/libcef_dll/cpptoc/image_cpptoc.h index 26b79c98..1a90d930 100644 --- a/libcef_dll/cpptoc/image_cpptoc.h +++ b/libcef_dll/cpptoc/image_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_IMAGE_CPPTOC_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/cef_image.h" #include "include/capi/cef_image_capi.h" @@ -30,5 +30,4 @@ class CefImageCppToC CefImageCppToC(); }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_IMAGE_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/jsdialog_callback_cpptoc.h b/libcef_dll/cpptoc/jsdialog_callback_cpptoc.h index 5a1fe03b..5a4e7acb 100644 --- a/libcef_dll/cpptoc/jsdialog_callback_cpptoc.h +++ b/libcef_dll/cpptoc/jsdialog_callback_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_JSDIALOG_CALLBACK_CPPTOC_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/cef_jsdialog_handler.h" #include "include/capi/cef_jsdialog_handler_capi.h" @@ -31,5 +31,4 @@ class CefJSDialogCallbackCppToC CefJSDialogCallbackCppToC(); }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_JSDIALOG_CALLBACK_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/jsdialog_handler_cpptoc.h b/libcef_dll/cpptoc/jsdialog_handler_cpptoc.h index 5fc7df21..20efe169 100644 --- a/libcef_dll/cpptoc/jsdialog_handler_cpptoc.h +++ b/libcef_dll/cpptoc/jsdialog_handler_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_JSDIALOG_HANDLER_CPPTOC_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/cef_jsdialog_handler.h" #include "include/capi/cef_jsdialog_handler_capi.h" @@ -31,5 +31,4 @@ class CefJSDialogHandlerCppToC CefJSDialogHandlerCppToC(); }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_JSDIALOG_HANDLER_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/keyboard_handler_cpptoc.h b/libcef_dll/cpptoc/keyboard_handler_cpptoc.h index ace14267..9fc3c47d 100644 --- a/libcef_dll/cpptoc/keyboard_handler_cpptoc.h +++ b/libcef_dll/cpptoc/keyboard_handler_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_KEYBOARD_HANDLER_CPPTOC_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/cef_keyboard_handler.h" #include "include/capi/cef_keyboard_handler_capi.h" @@ -31,5 +31,4 @@ class CefKeyboardHandlerCppToC CefKeyboardHandlerCppToC(); }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_KEYBOARD_HANDLER_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/life_span_handler_cpptoc.h b/libcef_dll/cpptoc/life_span_handler_cpptoc.h index f2b5ccf9..732d7e30 100644 --- a/libcef_dll/cpptoc/life_span_handler_cpptoc.h +++ b/libcef_dll/cpptoc/life_span_handler_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_LIFE_SPAN_HANDLER_CPPTOC_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/cef_life_span_handler.h" #include "include/capi/cef_life_span_handler_capi.h" @@ -33,5 +33,4 @@ class CefLifeSpanHandlerCppToC CefLifeSpanHandlerCppToC(); }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_LIFE_SPAN_HANDLER_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/list_value_cpptoc.h b/libcef_dll/cpptoc/list_value_cpptoc.h index 261c9f44..42d047ab 100644 --- a/libcef_dll/cpptoc/list_value_cpptoc.h +++ b/libcef_dll/cpptoc/list_value_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_LIST_VALUE_CPPTOC_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/cef_values.h" #include "include/capi/cef_values_capi.h" @@ -30,5 +30,4 @@ class CefListValueCppToC CefListValueCppToC(); }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_LIST_VALUE_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/load_handler_cpptoc.h b/libcef_dll/cpptoc/load_handler_cpptoc.h index 910d01e4..960b9f96 100644 --- a/libcef_dll/cpptoc/load_handler_cpptoc.h +++ b/libcef_dll/cpptoc/load_handler_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_LOAD_HANDLER_CPPTOC_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/cef_load_handler.h" #include "include/capi/cef_load_handler_capi.h" @@ -31,5 +31,4 @@ class CefLoadHandlerCppToC CefLoadHandlerCppToC(); }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_LOAD_HANDLER_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/menu_model_cpptoc.h b/libcef_dll/cpptoc/menu_model_cpptoc.h index 881b7a3d..43ee2131 100644 --- a/libcef_dll/cpptoc/menu_model_cpptoc.h +++ b/libcef_dll/cpptoc/menu_model_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_MENU_MODEL_CPPTOC_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/cef_menu_model.h" #include "include/capi/cef_menu_model_capi.h" @@ -30,5 +30,4 @@ class CefMenuModelCppToC CefMenuModelCppToC(); }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_MENU_MODEL_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/menu_model_delegate_cpptoc.h b/libcef_dll/cpptoc/menu_model_delegate_cpptoc.h index 5a580909..2caa0145 100644 --- a/libcef_dll/cpptoc/menu_model_delegate_cpptoc.h +++ b/libcef_dll/cpptoc/menu_model_delegate_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_MENU_MODEL_DELEGATE_CPPTOC_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/cef_menu_model_delegate.h" #include "include/capi/cef_menu_model_delegate_capi.h" @@ -33,5 +33,4 @@ class CefMenuModelDelegateCppToC CefMenuModelDelegateCppToC(); }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_MENU_MODEL_DELEGATE_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/navigation_entry_cpptoc.h b/libcef_dll/cpptoc/navigation_entry_cpptoc.h index 798c0f4c..d847fbf0 100644 --- a/libcef_dll/cpptoc/navigation_entry_cpptoc.h +++ b/libcef_dll/cpptoc/navigation_entry_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_NAVIGATION_ENTRY_CPPTOC_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/cef_navigation_entry.h" #include "include/capi/cef_navigation_entry_capi.h" @@ -31,5 +31,4 @@ class CefNavigationEntryCppToC CefNavigationEntryCppToC(); }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_NAVIGATION_ENTRY_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/navigation_entry_visitor_cpptoc.h b/libcef_dll/cpptoc/navigation_entry_visitor_cpptoc.h index 5cd69145..58fb816c 100644 --- a/libcef_dll/cpptoc/navigation_entry_visitor_cpptoc.h +++ b/libcef_dll/cpptoc/navigation_entry_visitor_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_NAVIGATION_ENTRY_VISITOR_CPPTOC_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/cef_browser.h" #include "include/capi/cef_browser_capi.h" @@ -33,5 +33,4 @@ class CefNavigationEntryVisitorCppToC CefNavigationEntryVisitorCppToC(); }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_NAVIGATION_ENTRY_VISITOR_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/pdf_print_callback_cpptoc.h b/libcef_dll/cpptoc/pdf_print_callback_cpptoc.h index 14382b04..0e3f1e19 100644 --- a/libcef_dll/cpptoc/pdf_print_callback_cpptoc.h +++ b/libcef_dll/cpptoc/pdf_print_callback_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_PDF_PRINT_CALLBACK_CPPTOC_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/cef_browser.h" #include "include/capi/cef_browser_capi.h" @@ -33,5 +33,4 @@ class CefPdfPrintCallbackCppToC CefPdfPrintCallbackCppToC(); }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_PDF_PRINT_CALLBACK_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/post_data_cpptoc.h b/libcef_dll/cpptoc/post_data_cpptoc.h index 13465d5f..ea43a203 100644 --- a/libcef_dll/cpptoc/post_data_cpptoc.h +++ b/libcef_dll/cpptoc/post_data_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_POST_DATA_CPPTOC_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/cef_request.h" #include "include/capi/cef_request_capi.h" @@ -30,5 +30,4 @@ class CefPostDataCppToC CefPostDataCppToC(); }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_POST_DATA_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/post_data_element_cpptoc.h b/libcef_dll/cpptoc/post_data_element_cpptoc.h index f52c1a69..3ff3ad01 100644 --- a/libcef_dll/cpptoc/post_data_element_cpptoc.h +++ b/libcef_dll/cpptoc/post_data_element_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_POST_DATA_ELEMENT_CPPTOC_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/cef_request.h" #include "include/capi/cef_request_capi.h" @@ -31,5 +31,4 @@ class CefPostDataElementCppToC CefPostDataElementCppToC(); }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_POST_DATA_ELEMENT_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/print_dialog_callback_cpptoc.h b/libcef_dll/cpptoc/print_dialog_callback_cpptoc.h index 0b464574..80669e8a 100644 --- a/libcef_dll/cpptoc/print_dialog_callback_cpptoc.h +++ b/libcef_dll/cpptoc/print_dialog_callback_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_PRINT_DIALOG_CALLBACK_CPPTOC_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/cef_print_handler.h" #include "include/capi/cef_print_handler_capi.h" @@ -31,5 +31,4 @@ class CefPrintDialogCallbackCppToC CefPrintDialogCallbackCppToC(); }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_PRINT_DIALOG_CALLBACK_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/print_handler_cpptoc.h b/libcef_dll/cpptoc/print_handler_cpptoc.h index 30a9aa5f..379d7e0f 100644 --- a/libcef_dll/cpptoc/print_handler_cpptoc.h +++ b/libcef_dll/cpptoc/print_handler_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_PRINT_HANDLER_CPPTOC_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/cef_print_handler.h" #include "include/capi/cef_print_handler_capi.h" @@ -31,5 +31,4 @@ class CefPrintHandlerCppToC CefPrintHandlerCppToC(); }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_PRINT_HANDLER_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/print_job_callback_cpptoc.h b/libcef_dll/cpptoc/print_job_callback_cpptoc.h index 1c410414..e3437ba4 100644 --- a/libcef_dll/cpptoc/print_job_callback_cpptoc.h +++ b/libcef_dll/cpptoc/print_job_callback_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_PRINT_JOB_CALLBACK_CPPTOC_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/cef_print_handler.h" #include "include/capi/cef_print_handler_capi.h" @@ -31,5 +31,4 @@ class CefPrintJobCallbackCppToC CefPrintJobCallbackCppToC(); }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_PRINT_JOB_CALLBACK_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/print_settings_cpptoc.h b/libcef_dll/cpptoc/print_settings_cpptoc.h index c3f67c8d..730bd2f1 100644 --- a/libcef_dll/cpptoc/print_settings_cpptoc.h +++ b/libcef_dll/cpptoc/print_settings_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_PRINT_SETTINGS_CPPTOC_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/cef_print_settings.h" #include "include/capi/cef_print_settings_capi.h" @@ -31,5 +31,4 @@ class CefPrintSettingsCppToC CefPrintSettingsCppToC(); }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_PRINT_SETTINGS_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/process_message_cpptoc.h b/libcef_dll/cpptoc/process_message_cpptoc.h index 5a1eb2b3..858c83ad 100644 --- a/libcef_dll/cpptoc/process_message_cpptoc.h +++ b/libcef_dll/cpptoc/process_message_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_PROCESS_MESSAGE_CPPTOC_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/cef_process_message.h" #include "include/capi/cef_process_message_capi.h" @@ -31,5 +31,4 @@ class CefProcessMessageCppToC CefProcessMessageCppToC(); }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_PROCESS_MESSAGE_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/read_handler_cpptoc.h b/libcef_dll/cpptoc/read_handler_cpptoc.h index f9749350..9c303c10 100644 --- a/libcef_dll/cpptoc/read_handler_cpptoc.h +++ b/libcef_dll/cpptoc/read_handler_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_READ_HANDLER_CPPTOC_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/cef_stream.h" #include "include/capi/cef_stream_capi.h" @@ -31,5 +31,4 @@ class CefReadHandlerCppToC CefReadHandlerCppToC(); }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_READ_HANDLER_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/register_cdm_callback_cpptoc.h b/libcef_dll/cpptoc/register_cdm_callback_cpptoc.h index 44706abd..aa2cd05b 100644 --- a/libcef_dll/cpptoc/register_cdm_callback_cpptoc.h +++ b/libcef_dll/cpptoc/register_cdm_callback_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_REGISTER_CDM_CALLBACK_CPPTOC_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/cef_web_plugin.h" #include "include/capi/cef_web_plugin_capi.h" @@ -33,5 +33,4 @@ class CefRegisterCdmCallbackCppToC CefRegisterCdmCallbackCppToC(); }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_REGISTER_CDM_CALLBACK_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/render_handler_cpptoc.h b/libcef_dll/cpptoc/render_handler_cpptoc.h index 189f1274..9c461c18 100644 --- a/libcef_dll/cpptoc/render_handler_cpptoc.h +++ b/libcef_dll/cpptoc/render_handler_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_RENDER_HANDLER_CPPTOC_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/cef_render_handler.h" #include "include/capi/cef_render_handler_capi.h" @@ -31,5 +31,4 @@ class CefRenderHandlerCppToC CefRenderHandlerCppToC(); }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_RENDER_HANDLER_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/render_process_handler_cpptoc.h b/libcef_dll/cpptoc/render_process_handler_cpptoc.h index 0fd1de19..74e7b124 100644 --- a/libcef_dll/cpptoc/render_process_handler_cpptoc.h +++ b/libcef_dll/cpptoc/render_process_handler_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_RENDER_PROCESS_HANDLER_CPPTOC_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/cef_render_process_handler.h" #include "include/capi/cef_render_process_handler_capi.h" @@ -31,5 +31,4 @@ class CefRenderProcessHandlerCppToC CefRenderProcessHandlerCppToC(); }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_RENDER_PROCESS_HANDLER_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/request_callback_cpptoc.h b/libcef_dll/cpptoc/request_callback_cpptoc.h index 55b4bca3..251d5f1f 100644 --- a/libcef_dll/cpptoc/request_callback_cpptoc.h +++ b/libcef_dll/cpptoc/request_callback_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_REQUEST_CALLBACK_CPPTOC_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/cef_request_handler.h" #include "include/capi/cef_request_handler_capi.h" @@ -31,5 +31,4 @@ class CefRequestCallbackCppToC CefRequestCallbackCppToC(); }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_REQUEST_CALLBACK_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/request_context_cpptoc.h b/libcef_dll/cpptoc/request_context_cpptoc.h index 747a4628..67d15b89 100644 --- a/libcef_dll/cpptoc/request_context_cpptoc.h +++ b/libcef_dll/cpptoc/request_context_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_REQUEST_CONTEXT_CPPTOC_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/cef_request_context.h" #include "include/capi/cef_request_context_capi.h" @@ -33,5 +33,4 @@ class CefRequestContextCppToC CefRequestContextCppToC(); }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_REQUEST_CONTEXT_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/request_context_handler_cpptoc.h b/libcef_dll/cpptoc/request_context_handler_cpptoc.h index 9996027e..85f75467 100644 --- a/libcef_dll/cpptoc/request_context_handler_cpptoc.h +++ b/libcef_dll/cpptoc/request_context_handler_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_REQUEST_CONTEXT_HANDLER_CPPTOC_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/cef_request_context_handler.h" #include "include/capi/cef_request_context_handler_capi.h" @@ -31,5 +31,4 @@ class CefRequestContextHandlerCppToC CefRequestContextHandlerCppToC(); }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_REQUEST_CONTEXT_HANDLER_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/request_cpptoc.h b/libcef_dll/cpptoc/request_cpptoc.h index 4fd412b5..19efc05e 100644 --- a/libcef_dll/cpptoc/request_cpptoc.h +++ b/libcef_dll/cpptoc/request_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_REQUEST_CPPTOC_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/cef_request.h" #include "include/capi/cef_request_capi.h" @@ -30,5 +30,4 @@ class CefRequestCppToC CefRequestCppToC(); }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_REQUEST_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/request_handler_cpptoc.h b/libcef_dll/cpptoc/request_handler_cpptoc.h index 4542fa4c..1707b6ac 100644 --- a/libcef_dll/cpptoc/request_handler_cpptoc.h +++ b/libcef_dll/cpptoc/request_handler_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_REQUEST_HANDLER_CPPTOC_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/cef_request_handler.h" #include "include/capi/cef_request_handler_capi.h" @@ -31,5 +31,4 @@ class CefRequestHandlerCppToC CefRequestHandlerCppToC(); }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_REQUEST_HANDLER_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/resolve_callback_cpptoc.h b/libcef_dll/cpptoc/resolve_callback_cpptoc.h index 954c0a47..800179bb 100644 --- a/libcef_dll/cpptoc/resolve_callback_cpptoc.h +++ b/libcef_dll/cpptoc/resolve_callback_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_RESOLVE_CALLBACK_CPPTOC_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/cef_request_context.h" #include "include/capi/cef_request_context_capi.h" @@ -33,5 +33,4 @@ class CefResolveCallbackCppToC CefResolveCallbackCppToC(); }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_RESOLVE_CALLBACK_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/resource_bundle_cpptoc.h b/libcef_dll/cpptoc/resource_bundle_cpptoc.h index 3205f480..a8b01c62 100644 --- a/libcef_dll/cpptoc/resource_bundle_cpptoc.h +++ b/libcef_dll/cpptoc/resource_bundle_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_RESOURCE_BUNDLE_CPPTOC_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/cef_resource_bundle.h" #include "include/capi/cef_resource_bundle_capi.h" @@ -31,5 +31,4 @@ class CefResourceBundleCppToC CefResourceBundleCppToC(); }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_RESOURCE_BUNDLE_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/resource_bundle_handler_cpptoc.h b/libcef_dll/cpptoc/resource_bundle_handler_cpptoc.h index 306be457..481d231d 100644 --- a/libcef_dll/cpptoc/resource_bundle_handler_cpptoc.h +++ b/libcef_dll/cpptoc/resource_bundle_handler_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_RESOURCE_BUNDLE_HANDLER_CPPTOC_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/cef_resource_bundle_handler.h" #include "include/capi/cef_resource_bundle_handler_capi.h" @@ -31,5 +31,4 @@ class CefResourceBundleHandlerCppToC CefResourceBundleHandlerCppToC(); }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_RESOURCE_BUNDLE_HANDLER_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/resource_handler_cpptoc.h b/libcef_dll/cpptoc/resource_handler_cpptoc.h index a1f57baa..71ed9d17 100644 --- a/libcef_dll/cpptoc/resource_handler_cpptoc.h +++ b/libcef_dll/cpptoc/resource_handler_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_RESOURCE_HANDLER_CPPTOC_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/cef_resource_handler.h" #include "include/capi/cef_resource_handler_capi.h" @@ -31,5 +31,4 @@ class CefResourceHandlerCppToC CefResourceHandlerCppToC(); }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_RESOURCE_HANDLER_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/response_cpptoc.h b/libcef_dll/cpptoc/response_cpptoc.h index a91788eb..a3d09eed 100644 --- a/libcef_dll/cpptoc/response_cpptoc.h +++ b/libcef_dll/cpptoc/response_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_RESPONSE_CPPTOC_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/cef_response.h" #include "include/capi/cef_response_capi.h" @@ -30,5 +30,4 @@ class CefResponseCppToC CefResponseCppToC(); }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_RESPONSE_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/response_filter_cpptoc.h b/libcef_dll/cpptoc/response_filter_cpptoc.h index cd22f726..230b1c59 100644 --- a/libcef_dll/cpptoc/response_filter_cpptoc.h +++ b/libcef_dll/cpptoc/response_filter_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_RESPONSE_FILTER_CPPTOC_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/cef_response_filter.h" #include "include/capi/cef_response_filter_capi.h" @@ -31,5 +31,4 @@ class CefResponseFilterCppToC CefResponseFilterCppToC(); }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_RESPONSE_FILTER_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/run_context_menu_callback_cpptoc.h b/libcef_dll/cpptoc/run_context_menu_callback_cpptoc.h index 2d894004..fcccafe2 100644 --- a/libcef_dll/cpptoc/run_context_menu_callback_cpptoc.h +++ b/libcef_dll/cpptoc/run_context_menu_callback_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_RUN_CONTEXT_MENU_CALLBACK_CPPTOC_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/cef_context_menu_handler.h" #include "include/capi/cef_context_menu_handler_capi.h" @@ -31,5 +31,4 @@ class CefRunContextMenuCallbackCppToC CefRunContextMenuCallbackCppToC(); }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_RUN_CONTEXT_MENU_CALLBACK_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/run_file_dialog_callback_cpptoc.h b/libcef_dll/cpptoc/run_file_dialog_callback_cpptoc.h index ded63d8c..e53571fe 100644 --- a/libcef_dll/cpptoc/run_file_dialog_callback_cpptoc.h +++ b/libcef_dll/cpptoc/run_file_dialog_callback_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_RUN_FILE_DIALOG_CALLBACK_CPPTOC_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/cef_browser.h" #include "include/capi/cef_browser_capi.h" @@ -33,5 +33,4 @@ class CefRunFileDialogCallbackCppToC CefRunFileDialogCallbackCppToC(); }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_RUN_FILE_DIALOG_CALLBACK_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/scheme_handler_factory_cpptoc.h b/libcef_dll/cpptoc/scheme_handler_factory_cpptoc.h index 85e32a47..69f496b5 100644 --- a/libcef_dll/cpptoc/scheme_handler_factory_cpptoc.h +++ b/libcef_dll/cpptoc/scheme_handler_factory_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_SCHEME_HANDLER_FACTORY_CPPTOC_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/cef_scheme.h" #include "include/capi/cef_scheme_capi.h" @@ -31,5 +31,4 @@ class CefSchemeHandlerFactoryCppToC CefSchemeHandlerFactoryCppToC(); }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_SCHEME_HANDLER_FACTORY_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/scheme_registrar_cpptoc.h b/libcef_dll/cpptoc/scheme_registrar_cpptoc.h index 29d741f3..579a7011 100644 --- a/libcef_dll/cpptoc/scheme_registrar_cpptoc.h +++ b/libcef_dll/cpptoc/scheme_registrar_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_SCHEME_REGISTRAR_CPPTOC_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/cef_scheme.h" #include "include/capi/cef_scheme_capi.h" @@ -31,5 +31,4 @@ class CefSchemeRegistrarCppToC CefSchemeRegistrarCppToC(); }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_SCHEME_REGISTRAR_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/select_client_certificate_callback_cpptoc.h b/libcef_dll/cpptoc/select_client_certificate_callback_cpptoc.h index 6c790612..4be6bbf0 100644 --- a/libcef_dll/cpptoc/select_client_certificate_callback_cpptoc.h +++ b/libcef_dll/cpptoc/select_client_certificate_callback_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_SELECT_CLIENT_CERTIFICATE_CALLBACK_CPPTOC_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/cef_request_handler.h" #include "include/capi/cef_request_handler_capi.h" @@ -32,5 +32,4 @@ class CefSelectClientCertificateCallbackCppToC CefSelectClientCertificateCallbackCppToC(); }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_SELECT_CLIENT_CERTIFICATE_CALLBACK_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/set_cookie_callback_cpptoc.h b/libcef_dll/cpptoc/set_cookie_callback_cpptoc.h index 388ba0ad..89b6781f 100644 --- a/libcef_dll/cpptoc/set_cookie_callback_cpptoc.h +++ b/libcef_dll/cpptoc/set_cookie_callback_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_SET_COOKIE_CALLBACK_CPPTOC_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/cef_cookie.h" #include "include/capi/cef_cookie_capi.h" @@ -31,5 +31,4 @@ class CefSetCookieCallbackCppToC CefSetCookieCallbackCppToC(); }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_SET_COOKIE_CALLBACK_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/sslinfo_cpptoc.h b/libcef_dll/cpptoc/sslinfo_cpptoc.h index 246cb02a..3fc3e823 100644 --- a/libcef_dll/cpptoc/sslinfo_cpptoc.h +++ b/libcef_dll/cpptoc/sslinfo_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_SSLINFO_CPPTOC_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/cef_ssl_info.h" #include "include/capi/cef_ssl_info_capi.h" @@ -30,5 +30,4 @@ class CefSSLInfoCppToC CefSSLInfoCppToC(); }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_SSLINFO_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/sslstatus_cpptoc.h b/libcef_dll/cpptoc/sslstatus_cpptoc.h index 24ed1c99..1f16f87a 100644 --- a/libcef_dll/cpptoc/sslstatus_cpptoc.h +++ b/libcef_dll/cpptoc/sslstatus_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_SSLSTATUS_CPPTOC_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/cef_ssl_status.h" #include "include/capi/cef_ssl_status_capi.h" @@ -30,5 +30,4 @@ class CefSSLStatusCppToC CefSSLStatusCppToC(); }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_SSLSTATUS_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/stream_reader_cpptoc.h b/libcef_dll/cpptoc/stream_reader_cpptoc.h index 2bd96b10..0bf4722a 100644 --- a/libcef_dll/cpptoc/stream_reader_cpptoc.h +++ b/libcef_dll/cpptoc/stream_reader_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_STREAM_READER_CPPTOC_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/cef_stream.h" #include "include/capi/cef_stream_capi.h" @@ -31,5 +31,4 @@ class CefStreamReaderCppToC CefStreamReaderCppToC(); }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_STREAM_READER_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/stream_writer_cpptoc.h b/libcef_dll/cpptoc/stream_writer_cpptoc.h index 8a0a9dfb..02ec13a2 100644 --- a/libcef_dll/cpptoc/stream_writer_cpptoc.h +++ b/libcef_dll/cpptoc/stream_writer_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_STREAM_WRITER_CPPTOC_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/cef_stream.h" #include "include/capi/cef_stream_capi.h" @@ -31,5 +31,4 @@ class CefStreamWriterCppToC CefStreamWriterCppToC(); }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_STREAM_WRITER_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/string_visitor_cpptoc.h b/libcef_dll/cpptoc/string_visitor_cpptoc.h index 16eb7845..db3f67a2 100644 --- a/libcef_dll/cpptoc/string_visitor_cpptoc.h +++ b/libcef_dll/cpptoc/string_visitor_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_STRING_VISITOR_CPPTOC_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/cef_string_visitor.h" #include "include/capi/cef_string_visitor_capi.h" @@ -31,5 +31,4 @@ class CefStringVisitorCppToC CefStringVisitorCppToC(); }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_STRING_VISITOR_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/task_cpptoc.h b/libcef_dll/cpptoc/task_cpptoc.h index 544c153c..00507503 100644 --- a/libcef_dll/cpptoc/task_cpptoc.h +++ b/libcef_dll/cpptoc/task_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_TASK_CPPTOC_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/cef_task.h" #include "include/capi/cef_task_capi.h" @@ -30,5 +30,4 @@ class CefTaskCppToC CefTaskCppToC(); }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_TASK_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/task_runner_cpptoc.h b/libcef_dll/cpptoc/task_runner_cpptoc.h index c6f6af52..4634609a 100644 --- a/libcef_dll/cpptoc/task_runner_cpptoc.h +++ b/libcef_dll/cpptoc/task_runner_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_TASK_RUNNER_CPPTOC_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/cef_task.h" #include "include/capi/cef_task_capi.h" @@ -30,5 +30,4 @@ class CefTaskRunnerCppToC CefTaskRunnerCppToC(); }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_TASK_RUNNER_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/test/translator_test_cpptoc.h b/libcef_dll/cpptoc/test/translator_test_cpptoc.h index 8379a4ae..4930f46c 100644 --- a/libcef_dll/cpptoc/test/translator_test_cpptoc.h +++ b/libcef_dll/cpptoc/test/translator_test_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_TEST_TRANSLATOR_TEST_CPPTOC_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/test/cef_translator_test.h" #include "include/capi/test/cef_translator_test_capi.h" @@ -31,5 +31,4 @@ class CefTranslatorTestCppToC CefTranslatorTestCppToC(); }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_TEST_TRANSLATOR_TEST_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/test/translator_test_handler_child_cpptoc.h b/libcef_dll/cpptoc/test/translator_test_handler_child_cpptoc.h index a57588d4..5f56203e 100644 --- a/libcef_dll/cpptoc/test/translator_test_handler_child_cpptoc.h +++ b/libcef_dll/cpptoc/test/translator_test_handler_child_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_TEST_TRANSLATOR_TEST_HANDLER_CHILD_CPPTOC_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/test/cef_translator_test.h" #include "include/capi/test/cef_translator_test_capi.h" @@ -31,5 +31,4 @@ class CefTranslatorTestHandlerChildCppToC CefTranslatorTestHandlerChildCppToC(); }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_TEST_TRANSLATOR_TEST_HANDLER_CHILD_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/test/translator_test_handler_cpptoc.h b/libcef_dll/cpptoc/test/translator_test_handler_cpptoc.h index fcf8bdd8..a0997340 100644 --- a/libcef_dll/cpptoc/test/translator_test_handler_cpptoc.h +++ b/libcef_dll/cpptoc/test/translator_test_handler_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_TEST_TRANSLATOR_TEST_HANDLER_CPPTOC_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/test/cef_translator_test.h" #include "include/capi/test/cef_translator_test_capi.h" @@ -31,5 +31,4 @@ class CefTranslatorTestHandlerCppToC CefTranslatorTestHandlerCppToC(); }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_TEST_TRANSLATOR_TEST_HANDLER_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/test/translator_test_object_child_child_cpptoc.h b/libcef_dll/cpptoc/test/translator_test_object_child_child_cpptoc.h index 669ef182..9fbc8f66 100644 --- a/libcef_dll/cpptoc/test/translator_test_object_child_child_cpptoc.h +++ b/libcef_dll/cpptoc/test/translator_test_object_child_child_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_TEST_TRANSLATOR_TEST_OBJECT_CHILD_CHILD_CPPTOC_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/test/cef_translator_test.h" #include "include/capi/test/cef_translator_test_capi.h" @@ -32,5 +32,4 @@ class CefTranslatorTestObjectChildChildCppToC CefTranslatorTestObjectChildChildCppToC(); }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_TEST_TRANSLATOR_TEST_OBJECT_CHILD_CHILD_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/test/translator_test_object_child_cpptoc.h b/libcef_dll/cpptoc/test/translator_test_object_child_cpptoc.h index 059174ca..9fc2de57 100644 --- a/libcef_dll/cpptoc/test/translator_test_object_child_cpptoc.h +++ b/libcef_dll/cpptoc/test/translator_test_object_child_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_TEST_TRANSLATOR_TEST_OBJECT_CHILD_CPPTOC_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/test/cef_translator_test.h" #include "include/capi/test/cef_translator_test_capi.h" @@ -31,5 +31,4 @@ class CefTranslatorTestObjectChildCppToC CefTranslatorTestObjectChildCppToC(); }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_TEST_TRANSLATOR_TEST_OBJECT_CHILD_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/test/translator_test_object_cpptoc.h b/libcef_dll/cpptoc/test/translator_test_object_cpptoc.h index 74b5fae6..8590d1ed 100644 --- a/libcef_dll/cpptoc/test/translator_test_object_cpptoc.h +++ b/libcef_dll/cpptoc/test/translator_test_object_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_TEST_TRANSLATOR_TEST_OBJECT_CPPTOC_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/test/cef_translator_test.h" #include "include/capi/test/cef_translator_test_capi.h" @@ -31,5 +31,4 @@ class CefTranslatorTestObjectCppToC CefTranslatorTestObjectCppToC(); }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_TEST_TRANSLATOR_TEST_OBJECT_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/thread_cpptoc.h b/libcef_dll/cpptoc/thread_cpptoc.h index 7d3754c7..bd156d08 100644 --- a/libcef_dll/cpptoc/thread_cpptoc.h +++ b/libcef_dll/cpptoc/thread_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_THREAD_CPPTOC_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/cef_thread.h" #include "include/capi/cef_thread_capi.h" @@ -30,5 +30,4 @@ class CefThreadCppToC CefThreadCppToC(); }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_THREAD_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/urlrequest_client_cpptoc.h b/libcef_dll/cpptoc/urlrequest_client_cpptoc.h index f2e72323..75819dc9 100644 --- a/libcef_dll/cpptoc/urlrequest_client_cpptoc.h +++ b/libcef_dll/cpptoc/urlrequest_client_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_URLREQUEST_CLIENT_CPPTOC_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/cef_urlrequest.h" #include "include/capi/cef_urlrequest_capi.h" @@ -31,5 +31,4 @@ class CefURLRequestClientCppToC CefURLRequestClientCppToC(); }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_URLREQUEST_CLIENT_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/urlrequest_cpptoc.h b/libcef_dll/cpptoc/urlrequest_cpptoc.h index ffbb993d..a9521317 100644 --- a/libcef_dll/cpptoc/urlrequest_cpptoc.h +++ b/libcef_dll/cpptoc/urlrequest_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_URLREQUEST_CPPTOC_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/cef_urlrequest.h" #include "include/capi/cef_urlrequest_capi.h" @@ -30,5 +30,4 @@ class CefURLRequestCppToC CefURLRequestCppToC(); }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_URLREQUEST_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/v8accessor_cpptoc.h b/libcef_dll/cpptoc/v8accessor_cpptoc.h index be661f8b..4bb5d877 100644 --- a/libcef_dll/cpptoc/v8accessor_cpptoc.h +++ b/libcef_dll/cpptoc/v8accessor_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_V8ACCESSOR_CPPTOC_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/cef_v8.h" #include "include/capi/cef_v8_capi.h" @@ -30,5 +30,4 @@ class CefV8AccessorCppToC CefV8AccessorCppToC(); }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_V8ACCESSOR_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/v8context_cpptoc.h b/libcef_dll/cpptoc/v8context_cpptoc.h index 94662c80..502adfe9 100644 --- a/libcef_dll/cpptoc/v8context_cpptoc.h +++ b/libcef_dll/cpptoc/v8context_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_V8CONTEXT_CPPTOC_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/cef_v8.h" #include "include/capi/cef_v8_capi.h" @@ -30,5 +30,4 @@ class CefV8ContextCppToC CefV8ContextCppToC(); }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_V8CONTEXT_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/v8exception_cpptoc.h b/libcef_dll/cpptoc/v8exception_cpptoc.h index 7a6672ba..c63fa9a7 100644 --- a/libcef_dll/cpptoc/v8exception_cpptoc.h +++ b/libcef_dll/cpptoc/v8exception_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_V8EXCEPTION_CPPTOC_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/cef_v8.h" #include "include/capi/cef_v8_capi.h" @@ -31,5 +31,4 @@ class CefV8ExceptionCppToC CefV8ExceptionCppToC(); }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_V8EXCEPTION_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/v8handler_cpptoc.h b/libcef_dll/cpptoc/v8handler_cpptoc.h index 3f278fd7..4f41b0a7 100644 --- a/libcef_dll/cpptoc/v8handler_cpptoc.h +++ b/libcef_dll/cpptoc/v8handler_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_V8HANDLER_CPPTOC_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/cef_v8.h" #include "include/capi/cef_v8_capi.h" @@ -30,5 +30,4 @@ class CefV8HandlerCppToC CefV8HandlerCppToC(); }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_V8HANDLER_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/v8interceptor_cpptoc.h b/libcef_dll/cpptoc/v8interceptor_cpptoc.h index 431fb5aa..05bb98d4 100644 --- a/libcef_dll/cpptoc/v8interceptor_cpptoc.h +++ b/libcef_dll/cpptoc/v8interceptor_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_V8INTERCEPTOR_CPPTOC_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/cef_v8.h" #include "include/capi/cef_v8_capi.h" @@ -31,5 +31,4 @@ class CefV8InterceptorCppToC CefV8InterceptorCppToC(); }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_V8INTERCEPTOR_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/v8stack_frame_cpptoc.h b/libcef_dll/cpptoc/v8stack_frame_cpptoc.h index 15fef81d..294cf4ae 100644 --- a/libcef_dll/cpptoc/v8stack_frame_cpptoc.h +++ b/libcef_dll/cpptoc/v8stack_frame_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_V8STACK_FRAME_CPPTOC_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/cef_v8.h" #include "include/capi/cef_v8_capi.h" @@ -31,5 +31,4 @@ class CefV8StackFrameCppToC CefV8StackFrameCppToC(); }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_V8STACK_FRAME_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/v8stack_trace_cpptoc.h b/libcef_dll/cpptoc/v8stack_trace_cpptoc.h index 10621474..f0e5b928 100644 --- a/libcef_dll/cpptoc/v8stack_trace_cpptoc.h +++ b/libcef_dll/cpptoc/v8stack_trace_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_V8STACK_TRACE_CPPTOC_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/cef_v8.h" #include "include/capi/cef_v8_capi.h" @@ -31,5 +31,4 @@ class CefV8StackTraceCppToC CefV8StackTraceCppToC(); }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_V8STACK_TRACE_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/v8value_cpptoc.h b/libcef_dll/cpptoc/v8value_cpptoc.h index 0ce917ba..b4cfc1d4 100644 --- a/libcef_dll/cpptoc/v8value_cpptoc.h +++ b/libcef_dll/cpptoc/v8value_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_V8VALUE_CPPTOC_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/cef_v8.h" #include "include/capi/cef_v8_capi.h" @@ -30,5 +30,4 @@ class CefV8ValueCppToC CefV8ValueCppToC(); }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_V8VALUE_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/value_cpptoc.h b/libcef_dll/cpptoc/value_cpptoc.h index 59b22f69..8911ee15 100644 --- a/libcef_dll/cpptoc/value_cpptoc.h +++ b/libcef_dll/cpptoc/value_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_VALUE_CPPTOC_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/cef_values.h" #include "include/capi/cef_values_capi.h" @@ -30,5 +30,4 @@ class CefValueCppToC CefValueCppToC(); }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_VALUE_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/views/box_layout_cpptoc.h b/libcef_dll/cpptoc/views/box_layout_cpptoc.h index 72bd98cd..2082909c 100644 --- a/libcef_dll/cpptoc/views/box_layout_cpptoc.h +++ b/libcef_dll/cpptoc/views/box_layout_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_VIEWS_BOX_LAYOUT_CPPTOC_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/views/cef_box_layout.h" #include "include/capi/views/cef_box_layout_capi.h" @@ -32,5 +32,4 @@ class CefBoxLayoutCppToC CefBoxLayoutCppToC(); }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_VIEWS_BOX_LAYOUT_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/views/browser_view_cpptoc.h b/libcef_dll/cpptoc/views/browser_view_cpptoc.h index 49d8804e..731cdc1f 100644 --- a/libcef_dll/cpptoc/views/browser_view_cpptoc.h +++ b/libcef_dll/cpptoc/views/browser_view_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_VIEWS_BROWSER_VIEW_CPPTOC_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/views/cef_browser_view.h" #include "include/capi/views/cef_browser_view_capi.h" @@ -31,5 +31,4 @@ class CefBrowserViewCppToC CefBrowserViewCppToC(); }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_VIEWS_BROWSER_VIEW_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/views/browser_view_delegate_cpptoc.h b/libcef_dll/cpptoc/views/browser_view_delegate_cpptoc.h index 6c65b240..05d345dc 100644 --- a/libcef_dll/cpptoc/views/browser_view_delegate_cpptoc.h +++ b/libcef_dll/cpptoc/views/browser_view_delegate_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_VIEWS_BROWSER_VIEW_DELEGATE_CPPTOC_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/views/cef_browser_view_delegate.h" #include "include/capi/views/cef_browser_view_delegate_capi.h" @@ -35,5 +35,4 @@ class CefBrowserViewDelegateCppToC CefBrowserViewDelegateCppToC(); }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_VIEWS_BROWSER_VIEW_DELEGATE_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/views/button_cpptoc.h b/libcef_dll/cpptoc/views/button_cpptoc.h index 9663372b..6d085830 100644 --- a/libcef_dll/cpptoc/views/button_cpptoc.h +++ b/libcef_dll/cpptoc/views/button_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_VIEWS_BUTTON_CPPTOC_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/views/cef_button.h" #include "include/capi/views/cef_button_capi.h" @@ -32,5 +32,4 @@ class CefButtonCppToC CefButtonCppToC(); }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_VIEWS_BUTTON_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/views/button_delegate_cpptoc.h b/libcef_dll/cpptoc/views/button_delegate_cpptoc.h index 1ea43a95..8f2bdc4f 100644 --- a/libcef_dll/cpptoc/views/button_delegate_cpptoc.h +++ b/libcef_dll/cpptoc/views/button_delegate_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_VIEWS_BUTTON_DELEGATE_CPPTOC_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/views/cef_button_delegate.h" #include "include/capi/views/cef_button_delegate_capi.h" @@ -33,5 +33,4 @@ class CefButtonDelegateCppToC CefButtonDelegateCppToC(); }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_VIEWS_BUTTON_DELEGATE_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/views/display_cpptoc.h b/libcef_dll/cpptoc/views/display_cpptoc.h index a3421555..0194d601 100644 --- a/libcef_dll/cpptoc/views/display_cpptoc.h +++ b/libcef_dll/cpptoc/views/display_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_VIEWS_DISPLAY_CPPTOC_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/views/cef_display.h" #include "include/capi/views/cef_display_capi.h" @@ -30,5 +30,4 @@ class CefDisplayCppToC CefDisplayCppToC(); }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_VIEWS_DISPLAY_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/views/fill_layout_cpptoc.h b/libcef_dll/cpptoc/views/fill_layout_cpptoc.h index 9219b112..1284ac48 100644 --- a/libcef_dll/cpptoc/views/fill_layout_cpptoc.h +++ b/libcef_dll/cpptoc/views/fill_layout_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_VIEWS_FILL_LAYOUT_CPPTOC_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/views/cef_fill_layout.h" #include "include/capi/views/cef_fill_layout_capi.h" @@ -30,5 +30,4 @@ class CefFillLayoutCppToC CefFillLayoutCppToC(); }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_VIEWS_FILL_LAYOUT_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/views/label_button_cpptoc.h b/libcef_dll/cpptoc/views/label_button_cpptoc.h index 49294d74..e3b614f6 100644 --- a/libcef_dll/cpptoc/views/label_button_cpptoc.h +++ b/libcef_dll/cpptoc/views/label_button_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_VIEWS_LABEL_BUTTON_CPPTOC_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/views/cef_label_button.h" #include "include/capi/views/cef_label_button_capi.h" @@ -33,5 +33,4 @@ class CefLabelButtonCppToC CefLabelButtonCppToC(); }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_VIEWS_LABEL_BUTTON_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/views/layout_cpptoc.h b/libcef_dll/cpptoc/views/layout_cpptoc.h index 63a42820..92a3e150 100644 --- a/libcef_dll/cpptoc/views/layout_cpptoc.h +++ b/libcef_dll/cpptoc/views/layout_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_VIEWS_LAYOUT_CPPTOC_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/views/cef_layout.h" #include "include/capi/views/cef_layout_capi.h" @@ -34,5 +34,4 @@ class CefLayoutCppToC CefLayoutCppToC(); }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_VIEWS_LAYOUT_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/views/menu_button_cpptoc.h b/libcef_dll/cpptoc/views/menu_button_cpptoc.h index 55eb82d0..01687914 100644 --- a/libcef_dll/cpptoc/views/menu_button_cpptoc.h +++ b/libcef_dll/cpptoc/views/menu_button_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_VIEWS_MENU_BUTTON_CPPTOC_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/views/cef_menu_button.h" #include "include/capi/views/cef_menu_button_capi.h" @@ -30,5 +30,4 @@ class CefMenuButtonCppToC CefMenuButtonCppToC(); }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_VIEWS_MENU_BUTTON_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/views/menu_button_delegate_cpptoc.h b/libcef_dll/cpptoc/views/menu_button_delegate_cpptoc.h index a5aa2ae6..8a97239b 100644 --- a/libcef_dll/cpptoc/views/menu_button_delegate_cpptoc.h +++ b/libcef_dll/cpptoc/views/menu_button_delegate_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_VIEWS_MENU_BUTTON_DELEGATE_CPPTOC_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/views/cef_menu_button_delegate.h" #include "include/capi/views/cef_menu_button_delegate_capi.h" @@ -33,5 +33,4 @@ class CefMenuButtonDelegateCppToC CefMenuButtonDelegateCppToC(); }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_VIEWS_MENU_BUTTON_DELEGATE_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/views/panel_cpptoc.h b/libcef_dll/cpptoc/views/panel_cpptoc.h index 8b55f2e9..d25c99a8 100644 --- a/libcef_dll/cpptoc/views/panel_cpptoc.h +++ b/libcef_dll/cpptoc/views/panel_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_VIEWS_PANEL_CPPTOC_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/views/cef_panel.h" #include "include/capi/views/cef_panel_capi.h" @@ -38,5 +38,4 @@ class CefPanelCppToC CefPanelCppToC(); }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_VIEWS_PANEL_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/views/panel_delegate_cpptoc.h b/libcef_dll/cpptoc/views/panel_delegate_cpptoc.h index 5c15e091..8193fc8b 100644 --- a/libcef_dll/cpptoc/views/panel_delegate_cpptoc.h +++ b/libcef_dll/cpptoc/views/panel_delegate_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_VIEWS_PANEL_DELEGATE_CPPTOC_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/views/cef_panel_delegate.h" #include "include/capi/views/cef_panel_delegate_capi.h" @@ -31,5 +31,4 @@ class CefPanelDelegateCppToC CefPanelDelegateCppToC(); }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_VIEWS_PANEL_DELEGATE_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/views/scroll_view_cpptoc.h b/libcef_dll/cpptoc/views/scroll_view_cpptoc.h index 862226c9..781d5ada 100644 --- a/libcef_dll/cpptoc/views/scroll_view_cpptoc.h +++ b/libcef_dll/cpptoc/views/scroll_view_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_VIEWS_SCROLL_VIEW_CPPTOC_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/views/cef_scroll_view.h" #include "include/capi/views/cef_scroll_view_capi.h" @@ -30,5 +30,4 @@ class CefScrollViewCppToC CefScrollViewCppToC(); }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_VIEWS_SCROLL_VIEW_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/views/textfield_cpptoc.h b/libcef_dll/cpptoc/views/textfield_cpptoc.h index 7ae7cea9..9b5239fd 100644 --- a/libcef_dll/cpptoc/views/textfield_cpptoc.h +++ b/libcef_dll/cpptoc/views/textfield_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_VIEWS_TEXTFIELD_CPPTOC_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/views/cef_textfield.h" #include "include/capi/views/cef_textfield_capi.h" @@ -30,5 +30,4 @@ class CefTextfieldCppToC CefTextfieldCppToC(); }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_VIEWS_TEXTFIELD_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/views/textfield_delegate_cpptoc.h b/libcef_dll/cpptoc/views/textfield_delegate_cpptoc.h index 0216e8f8..f0e8c510 100644 --- a/libcef_dll/cpptoc/views/textfield_delegate_cpptoc.h +++ b/libcef_dll/cpptoc/views/textfield_delegate_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_VIEWS_TEXTFIELD_DELEGATE_CPPTOC_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/views/cef_textfield_delegate.h" #include "include/capi/views/cef_textfield_delegate_capi.h" @@ -33,5 +33,4 @@ class CefTextfieldDelegateCppToC CefTextfieldDelegateCppToC(); }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_VIEWS_TEXTFIELD_DELEGATE_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/views/view_cpptoc.h b/libcef_dll/cpptoc/views/view_cpptoc.h index 3d963587..c5167d6c 100644 --- a/libcef_dll/cpptoc/views/view_cpptoc.h +++ b/libcef_dll/cpptoc/views/view_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_VIEWS_VIEW_CPPTOC_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/views/cef_view.h" #include "include/capi/views/cef_view_capi.h" @@ -42,5 +42,4 @@ class CefViewCppToC CefViewCppToC(); }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_VIEWS_VIEW_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/views/view_delegate_cpptoc.h b/libcef_dll/cpptoc/views/view_delegate_cpptoc.h index 7e97711d..45272233 100644 --- a/libcef_dll/cpptoc/views/view_delegate_cpptoc.h +++ b/libcef_dll/cpptoc/views/view_delegate_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_VIEWS_VIEW_DELEGATE_CPPTOC_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/views/cef_view_delegate.h" #include "include/capi/views/cef_view_delegate_capi.h" @@ -33,5 +33,4 @@ class CefViewDelegateCppToC CefViewDelegateCppToC(); }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_VIEWS_VIEW_DELEGATE_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/views/window_cpptoc.h b/libcef_dll/cpptoc/views/window_cpptoc.h index 827a94aa..c764d848 100644 --- a/libcef_dll/cpptoc/views/window_cpptoc.h +++ b/libcef_dll/cpptoc/views/window_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_VIEWS_WINDOW_CPPTOC_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/views/cef_window.h" #include "include/capi/views/cef_window_capi.h" @@ -30,5 +30,4 @@ class CefWindowCppToC CefWindowCppToC(); }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_VIEWS_WINDOW_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/views/window_delegate_cpptoc.h b/libcef_dll/cpptoc/views/window_delegate_cpptoc.h index a69c6817..76d42dae 100644 --- a/libcef_dll/cpptoc/views/window_delegate_cpptoc.h +++ b/libcef_dll/cpptoc/views/window_delegate_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_VIEWS_WINDOW_DELEGATE_CPPTOC_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/views/cef_window_delegate.h" #include "include/capi/views/cef_window_delegate_capi.h" @@ -33,5 +33,4 @@ class CefWindowDelegateCppToC CefWindowDelegateCppToC(); }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_VIEWS_WINDOW_DELEGATE_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/waitable_event_cpptoc.h b/libcef_dll/cpptoc/waitable_event_cpptoc.h index 43d2afa2..1dbe5c1d 100644 --- a/libcef_dll/cpptoc/waitable_event_cpptoc.h +++ b/libcef_dll/cpptoc/waitable_event_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_WAITABLE_EVENT_CPPTOC_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/cef_waitable_event.h" #include "include/capi/cef_waitable_event_capi.h" @@ -31,5 +31,4 @@ class CefWaitableEventCppToC CefWaitableEventCppToC(); }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_WAITABLE_EVENT_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/web_plugin_info_cpptoc.h b/libcef_dll/cpptoc/web_plugin_info_cpptoc.h index 550d3969..930e7d78 100644 --- a/libcef_dll/cpptoc/web_plugin_info_cpptoc.h +++ b/libcef_dll/cpptoc/web_plugin_info_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_WEB_PLUGIN_INFO_CPPTOC_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/cef_web_plugin.h" #include "include/capi/cef_web_plugin_capi.h" @@ -33,5 +33,4 @@ class CefWebPluginInfoCppToC CefWebPluginInfoCppToC(); }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_WEB_PLUGIN_INFO_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/web_plugin_info_visitor_cpptoc.h b/libcef_dll/cpptoc/web_plugin_info_visitor_cpptoc.h index b4e79f70..6bd84817 100644 --- a/libcef_dll/cpptoc/web_plugin_info_visitor_cpptoc.h +++ b/libcef_dll/cpptoc/web_plugin_info_visitor_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_WEB_PLUGIN_INFO_VISITOR_CPPTOC_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/cef_web_plugin.h" #include "include/capi/cef_web_plugin_capi.h" @@ -33,5 +33,4 @@ class CefWebPluginInfoVisitorCppToC CefWebPluginInfoVisitorCppToC(); }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_WEB_PLUGIN_INFO_VISITOR_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/web_plugin_unstable_callback_cpptoc.h b/libcef_dll/cpptoc/web_plugin_unstable_callback_cpptoc.h index 8bdc8772..defb2e1d 100644 --- a/libcef_dll/cpptoc/web_plugin_unstable_callback_cpptoc.h +++ b/libcef_dll/cpptoc/web_plugin_unstable_callback_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_WEB_PLUGIN_UNSTABLE_CALLBACK_CPPTOC_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/cef_web_plugin.h" #include "include/capi/cef_web_plugin_capi.h" @@ -33,5 +33,4 @@ class CefWebPluginUnstableCallbackCppToC CefWebPluginUnstableCallbackCppToC(); }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_WEB_PLUGIN_UNSTABLE_CALLBACK_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/write_handler_cpptoc.h b/libcef_dll/cpptoc/write_handler_cpptoc.h index 973f18e2..af8fc379 100644 --- a/libcef_dll/cpptoc/write_handler_cpptoc.h +++ b/libcef_dll/cpptoc/write_handler_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_WRITE_HANDLER_CPPTOC_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/cef_stream.h" #include "include/capi/cef_stream_capi.h" @@ -31,5 +31,4 @@ class CefWriteHandlerCppToC CefWriteHandlerCppToC(); }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_WRITE_HANDLER_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/x509cert_principal_cpptoc.h b/libcef_dll/cpptoc/x509cert_principal_cpptoc.h index 8b11b8e0..f22a3986 100644 --- a/libcef_dll/cpptoc/x509cert_principal_cpptoc.h +++ b/libcef_dll/cpptoc/x509cert_principal_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_X509CERT_PRINCIPAL_CPPTOC_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/cef_x509_certificate.h" #include "include/capi/cef_x509_certificate_capi.h" @@ -31,5 +31,4 @@ class CefX509CertPrincipalCppToC CefX509CertPrincipalCppToC(); }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_X509CERT_PRINCIPAL_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/x509certificate_cpptoc.h b/libcef_dll/cpptoc/x509certificate_cpptoc.h index 97682df7..87c4e150 100644 --- a/libcef_dll/cpptoc/x509certificate_cpptoc.h +++ b/libcef_dll/cpptoc/x509certificate_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_X509CERTIFICATE_CPPTOC_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/cef_x509_certificate.h" #include "include/capi/cef_x509_certificate_capi.h" @@ -31,5 +31,4 @@ class CefX509CertificateCppToC CefX509CertificateCppToC(); }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_X509CERTIFICATE_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/xml_reader_cpptoc.h b/libcef_dll/cpptoc/xml_reader_cpptoc.h index 3ce2b170..03905ee8 100644 --- a/libcef_dll/cpptoc/xml_reader_cpptoc.h +++ b/libcef_dll/cpptoc/xml_reader_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_XML_READER_CPPTOC_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/cef_xml_reader.h" #include "include/capi/cef_xml_reader_capi.h" @@ -30,5 +30,4 @@ class CefXmlReaderCppToC CefXmlReaderCppToC(); }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_XML_READER_CPPTOC_H_ diff --git a/libcef_dll/cpptoc/zip_reader_cpptoc.h b/libcef_dll/cpptoc/zip_reader_cpptoc.h index 71c52aea..01175c9a 100644 --- a/libcef_dll/cpptoc/zip_reader_cpptoc.h +++ b/libcef_dll/cpptoc/zip_reader_cpptoc.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CPPTOC_ZIP_READER_CPPTOC_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/cef_zip_reader.h" #include "include/capi/cef_zip_reader_capi.h" @@ -30,5 +30,4 @@ class CefZipReaderCppToC CefZipReaderCppToC(); }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CPPTOC_ZIP_READER_CPPTOC_H_ diff --git a/libcef_dll/ctocpp/app_ctocpp.h b/libcef_dll/ctocpp/app_ctocpp.h index b26fdc51..1bc17f11 100644 --- a/libcef_dll/ctocpp/app_ctocpp.h +++ b/libcef_dll/ctocpp/app_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_APP_CTOCPP_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/cef_app.h" #include "include/capi/cef_app_capi.h" @@ -39,5 +39,4 @@ class CefAppCToCpp CefRefPtr GetRenderProcessHandler() override; }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_APP_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/auth_callback_ctocpp.h b/libcef_dll/ctocpp/auth_callback_ctocpp.h index a8ad60fc..a71cd604 100644 --- a/libcef_dll/ctocpp/auth_callback_ctocpp.h +++ b/libcef_dll/ctocpp/auth_callback_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_AUTH_CALLBACK_CTOCPP_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/cef_auth_callback.h" #include "include/capi/cef_auth_callback_capi.h" @@ -35,5 +35,4 @@ class CefAuthCallbackCToCpp void Cancel() OVERRIDE; }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_AUTH_CALLBACK_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/base_ctocpp.h b/libcef_dll/ctocpp/base_ctocpp.h index e5e4b4b7..07051c3c 100644 --- a/libcef_dll/ctocpp/base_ctocpp.h +++ b/libcef_dll/ctocpp/base_ctocpp.h @@ -10,9 +10,9 @@ #include "include/capi/cef_base_capi.h" #include "libcef_dll/ctocpp/ctocpp.h" -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif // Wrap a C structure with a C++ class. class CefBaseCToCpp @@ -21,5 +21,4 @@ class CefBaseCToCpp CefBaseCToCpp(); }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_BASE_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/before_download_callback_ctocpp.h b/libcef_dll/ctocpp/before_download_callback_ctocpp.h index 5598c926..24963e28 100644 --- a/libcef_dll/ctocpp/before_download_callback_ctocpp.h +++ b/libcef_dll/ctocpp/before_download_callback_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_BEFORE_DOWNLOAD_CALLBACK_CTOCPP_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/cef_download_handler.h" #include "include/capi/cef_download_handler_capi.h" @@ -34,5 +34,4 @@ class CefBeforeDownloadCallbackCToCpp void Continue(const CefString& download_path, bool show_dialog) OVERRIDE; }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_BEFORE_DOWNLOAD_CALLBACK_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/binary_value_ctocpp.h b/libcef_dll/ctocpp/binary_value_ctocpp.h index 44a74e1d..38c11ae6 100644 --- a/libcef_dll/ctocpp/binary_value_ctocpp.h +++ b/libcef_dll/ctocpp/binary_value_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_BINARY_VALUE_CTOCPP_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/cef_values.h" #include "include/capi/cef_values_capi.h" @@ -40,5 +40,4 @@ class CefBinaryValueCToCpp size_t GetData(void* buffer, size_t buffer_size, size_t data_offset) OVERRIDE; }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_BINARY_VALUE_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/browser_ctocpp.h b/libcef_dll/ctocpp/browser_ctocpp.h index c33b055e..14ed3862 100644 --- a/libcef_dll/ctocpp/browser_ctocpp.h +++ b/libcef_dll/ctocpp/browser_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_BROWSER_CTOCPP_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include #include "include/cef_browser.h" @@ -57,5 +57,4 @@ class CefBrowserCToCpp CefRefPtr message) OVERRIDE; }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_BROWSER_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/browser_host_ctocpp.h b/libcef_dll/ctocpp/browser_host_ctocpp.h index cdec2c79..4547f652 100644 --- a/libcef_dll/ctocpp/browser_host_ctocpp.h +++ b/libcef_dll/ctocpp/browser_host_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_BROWSER_HOST_CTOCPP_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include #include "include/cef_browser.h" @@ -105,5 +105,4 @@ class CefBrowserHostCToCpp CefRefPtr GetVisibleNavigationEntry() OVERRIDE; }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_BROWSER_HOST_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/browser_process_handler_ctocpp.h b/libcef_dll/ctocpp/browser_process_handler_ctocpp.h index 53226ae4..08c4380c 100644 --- a/libcef_dll/ctocpp/browser_process_handler_ctocpp.h +++ b/libcef_dll/ctocpp/browser_process_handler_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_BROWSER_PROCESS_HANDLER_CTOCPP_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/cef_browser_process_handler.h" #include "include/capi/cef_browser_process_handler_capi.h" @@ -40,5 +40,4 @@ class CefBrowserProcessHandlerCToCpp void OnScheduleMessagePumpWork(int64 delay_ms) override; }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_BROWSER_PROCESS_HANDLER_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/callback_ctocpp.h b/libcef_dll/ctocpp/callback_ctocpp.h index e70543e4..7f09c8f7 100644 --- a/libcef_dll/ctocpp/callback_ctocpp.h +++ b/libcef_dll/ctocpp/callback_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_CALLBACK_CTOCPP_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/cef_callback.h" #include "include/capi/cef_callback_capi.h" @@ -34,5 +34,4 @@ class CefCallbackCToCpp void Cancel() OVERRIDE; }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_CALLBACK_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/client_ctocpp.h b/libcef_dll/ctocpp/client_ctocpp.h index 05768208..c4363cde 100644 --- a/libcef_dll/ctocpp/client_ctocpp.h +++ b/libcef_dll/ctocpp/client_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_CLIENT_CTOCPP_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/cef_client.h" #include "include/capi/cef_client_capi.h" @@ -49,5 +49,4 @@ class CefClientCToCpp CefRefPtr message) override; }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_CLIENT_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/command_line_ctocpp.h b/libcef_dll/ctocpp/command_line_ctocpp.h index fdb1f0da..60eb8df1 100644 --- a/libcef_dll/ctocpp/command_line_ctocpp.h +++ b/libcef_dll/ctocpp/command_line_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_COMMAND_LINE_CTOCPP_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include #include "include/cef_command_line.h" @@ -55,5 +55,4 @@ class CefCommandLineCToCpp void PrependWrapper(const CefString& wrapper) OVERRIDE; }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_COMMAND_LINE_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/completion_callback_ctocpp.h b/libcef_dll/ctocpp/completion_callback_ctocpp.h index af92c497..ae64ce2d 100644 --- a/libcef_dll/ctocpp/completion_callback_ctocpp.h +++ b/libcef_dll/ctocpp/completion_callback_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_COMPLETION_CALLBACK_CTOCPP_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/cef_callback.h" #include "include/capi/cef_callback_capi.h" @@ -34,5 +34,4 @@ class CefCompletionCallbackCToCpp void OnComplete() override; }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_COMPLETION_CALLBACK_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/context_menu_handler_ctocpp.h b/libcef_dll/ctocpp/context_menu_handler_ctocpp.h index db46c3e4..76c77bec 100644 --- a/libcef_dll/ctocpp/context_menu_handler_ctocpp.h +++ b/libcef_dll/ctocpp/context_menu_handler_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_CONTEXT_MENU_HANDLER_CTOCPP_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/cef_context_menu_handler.h" #include "include/capi/cef_context_menu_handler_capi.h" @@ -44,5 +44,4 @@ class CefContextMenuHandlerCToCpp CefRefPtr frame) override; }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_CONTEXT_MENU_HANDLER_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/context_menu_params_ctocpp.h b/libcef_dll/ctocpp/context_menu_params_ctocpp.h index 24e8b8fa..9a9d989a 100644 --- a/libcef_dll/ctocpp/context_menu_params_ctocpp.h +++ b/libcef_dll/ctocpp/context_menu_params_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_CONTEXT_MENU_PARAMS_CTOCPP_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include #include "include/cef_context_menu_handler.h" @@ -54,5 +54,4 @@ class CefContextMenuParamsCToCpp bool IsPepperMenu() OVERRIDE; }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_CONTEXT_MENU_PARAMS_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/cookie_manager_ctocpp.h b/libcef_dll/ctocpp/cookie_manager_ctocpp.h index 6316282d..7bb706b6 100644 --- a/libcef_dll/ctocpp/cookie_manager_ctocpp.h +++ b/libcef_dll/ctocpp/cookie_manager_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_COOKIE_MANAGER_CTOCPP_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include #include "include/cef_cookie.h" @@ -46,5 +46,4 @@ class CefCookieManagerCToCpp bool FlushStore(CefRefPtr callback) OVERRIDE; }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_COOKIE_MANAGER_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/cookie_visitor_ctocpp.h b/libcef_dll/ctocpp/cookie_visitor_ctocpp.h index 1578b432..f336c492 100644 --- a/libcef_dll/ctocpp/cookie_visitor_ctocpp.h +++ b/libcef_dll/ctocpp/cookie_visitor_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_COOKIE_VISITOR_CTOCPP_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/cef_cookie.h" #include "include/capi/cef_cookie_capi.h" @@ -35,5 +35,4 @@ class CefCookieVisitorCToCpp bool& deleteCookie) override; }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_COOKIE_VISITOR_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/delete_cookies_callback_ctocpp.h b/libcef_dll/ctocpp/delete_cookies_callback_ctocpp.h index a36109b9..95d9cbbb 100644 --- a/libcef_dll/ctocpp/delete_cookies_callback_ctocpp.h +++ b/libcef_dll/ctocpp/delete_cookies_callback_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_DELETE_COOKIES_CALLBACK_CTOCPP_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/cef_cookie.h" #include "include/capi/cef_cookie_capi.h" @@ -34,5 +34,4 @@ class CefDeleteCookiesCallbackCToCpp void OnComplete(int num_deleted) override; }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_DELETE_COOKIES_CALLBACK_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/dialog_handler_ctocpp.h b/libcef_dll/ctocpp/dialog_handler_ctocpp.h index 46b86966..698b25b1 100644 --- a/libcef_dll/ctocpp/dialog_handler_ctocpp.h +++ b/libcef_dll/ctocpp/dialog_handler_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_DIALOG_HANDLER_CTOCPP_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include #include "include/cef_dialog_handler.h" @@ -38,5 +38,4 @@ class CefDialogHandlerCToCpp CefRefPtr callback) override; }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_DIALOG_HANDLER_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/dictionary_value_ctocpp.h b/libcef_dll/ctocpp/dictionary_value_ctocpp.h index 496610cd..36e4e22f 100644 --- a/libcef_dll/ctocpp/dictionary_value_ctocpp.h +++ b/libcef_dll/ctocpp/dictionary_value_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_DICTIONARY_VALUE_CTOCPP_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/cef_values.h" #include "include/capi/cef_values_capi.h" @@ -64,5 +64,4 @@ class CefDictionaryValueCToCpp bool SetList(const CefString& key, CefRefPtr value) OVERRIDE; }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_DICTIONARY_VALUE_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/display_handler_ctocpp.h b/libcef_dll/ctocpp/display_handler_ctocpp.h index 760dc412..5ddc704e 100644 --- a/libcef_dll/ctocpp/display_handler_ctocpp.h +++ b/libcef_dll/ctocpp/display_handler_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_DISPLAY_HANDLER_CTOCPP_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include #include "include/cef_display_handler.h" @@ -47,5 +47,4 @@ class CefDisplayHandlerCToCpp const CefString& source, int line) override; }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_DISPLAY_HANDLER_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/domdocument_ctocpp.h b/libcef_dll/ctocpp/domdocument_ctocpp.h index d05a2670..45349a18 100644 --- a/libcef_dll/ctocpp/domdocument_ctocpp.h +++ b/libcef_dll/ctocpp/domdocument_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_DOMDOCUMENT_CTOCPP_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/cef_dom.h" #include "include/capi/cef_dom_capi.h" @@ -47,5 +47,4 @@ class CefDOMDocumentCToCpp CefString GetCompleteURL(const CefString& partialURL) OVERRIDE; }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_DOMDOCUMENT_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/domnode_ctocpp.h b/libcef_dll/ctocpp/domnode_ctocpp.h index 6e204c2a..967ec729 100644 --- a/libcef_dll/ctocpp/domnode_ctocpp.h +++ b/libcef_dll/ctocpp/domnode_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_DOMNODE_CTOCPP_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/cef_dom.h" #include "include/capi/cef_dom_capi.h" @@ -59,5 +59,4 @@ class CefDOMNodeCToCpp CefRect GetElementBounds() OVERRIDE; }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_DOMNODE_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/domvisitor_ctocpp.h b/libcef_dll/ctocpp/domvisitor_ctocpp.h index a57dc713..299ae180 100644 --- a/libcef_dll/ctocpp/domvisitor_ctocpp.h +++ b/libcef_dll/ctocpp/domvisitor_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_DOMVISITOR_CTOCPP_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/cef_dom.h" #include "include/capi/cef_dom_capi.h" @@ -33,5 +33,4 @@ class CefDOMVisitorCToCpp void Visit(CefRefPtr document) override; }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_DOMVISITOR_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/download_handler_ctocpp.h b/libcef_dll/ctocpp/download_handler_ctocpp.h index 068f07f3..b93abecd 100644 --- a/libcef_dll/ctocpp/download_handler_ctocpp.h +++ b/libcef_dll/ctocpp/download_handler_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_DOWNLOAD_HANDLER_CTOCPP_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/cef_download_handler.h" #include "include/capi/cef_download_handler_capi.h" @@ -40,5 +40,4 @@ class CefDownloadHandlerCToCpp CefRefPtr callback) override; }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_DOWNLOAD_HANDLER_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/download_image_callback_ctocpp.h b/libcef_dll/ctocpp/download_image_callback_ctocpp.h index dc5473f5..5550abfb 100644 --- a/libcef_dll/ctocpp/download_image_callback_ctocpp.h +++ b/libcef_dll/ctocpp/download_image_callback_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_DOWNLOAD_IMAGE_CALLBACK_CTOCPP_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/cef_browser.h" #include "include/capi/cef_browser_capi.h" @@ -37,5 +37,4 @@ class CefDownloadImageCallbackCToCpp CefRefPtr image) override; }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_DOWNLOAD_IMAGE_CALLBACK_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/download_item_callback_ctocpp.h b/libcef_dll/ctocpp/download_item_callback_ctocpp.h index 9d5301a7..cb32e3aa 100644 --- a/libcef_dll/ctocpp/download_item_callback_ctocpp.h +++ b/libcef_dll/ctocpp/download_item_callback_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_DOWNLOAD_ITEM_CALLBACK_CTOCPP_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/cef_download_handler.h" #include "include/capi/cef_download_handler_capi.h" @@ -36,5 +36,4 @@ class CefDownloadItemCallbackCToCpp void Resume() OVERRIDE; }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_DOWNLOAD_ITEM_CALLBACK_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/download_item_ctocpp.h b/libcef_dll/ctocpp/download_item_ctocpp.h index 616be105..0915f275 100644 --- a/libcef_dll/ctocpp/download_item_ctocpp.h +++ b/libcef_dll/ctocpp/download_item_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_DOWNLOAD_ITEM_CTOCPP_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/cef_download_item.h" #include "include/capi/cef_download_item_capi.h" @@ -50,5 +50,4 @@ class CefDownloadItemCToCpp CefString GetMimeType() OVERRIDE; }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_DOWNLOAD_ITEM_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/drag_data_ctocpp.h b/libcef_dll/ctocpp/drag_data_ctocpp.h index 225f57a1..24a729d5 100644 --- a/libcef_dll/ctocpp/drag_data_ctocpp.h +++ b/libcef_dll/ctocpp/drag_data_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_DRAG_DATA_CTOCPP_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include #include "include/cef_drag_data.h" @@ -55,5 +55,4 @@ class CefDragDataCToCpp void AddFile(const CefString& path, const CefString& display_name) OVERRIDE; }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_DRAG_DATA_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/drag_handler_ctocpp.h b/libcef_dll/ctocpp/drag_handler_ctocpp.h index 440fce21..0351f96d 100644 --- a/libcef_dll/ctocpp/drag_handler_ctocpp.h +++ b/libcef_dll/ctocpp/drag_handler_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_DRAG_HANDLER_CTOCPP_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include #include "include/cef_drag_handler.h" @@ -38,5 +38,4 @@ class CefDragHandlerCToCpp const std::vector& regions) override; }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_DRAG_HANDLER_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/end_tracing_callback_ctocpp.h b/libcef_dll/ctocpp/end_tracing_callback_ctocpp.h index 2bd86165..2e451e73 100644 --- a/libcef_dll/ctocpp/end_tracing_callback_ctocpp.h +++ b/libcef_dll/ctocpp/end_tracing_callback_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_END_TRACING_CALLBACK_CTOCPP_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/cef_trace.h" #include "include/capi/cef_trace_capi.h" @@ -34,5 +34,4 @@ class CefEndTracingCallbackCToCpp void OnEndTracingComplete(const CefString& tracing_file) override; }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_END_TRACING_CALLBACK_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/file_dialog_callback_ctocpp.h b/libcef_dll/ctocpp/file_dialog_callback_ctocpp.h index bb98f15e..bba8d1f6 100644 --- a/libcef_dll/ctocpp/file_dialog_callback_ctocpp.h +++ b/libcef_dll/ctocpp/file_dialog_callback_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_FILE_DIALOG_CALLBACK_CTOCPP_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include #include "include/cef_dialog_handler.h" @@ -37,5 +37,4 @@ class CefFileDialogCallbackCToCpp void Cancel() OVERRIDE; }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_FILE_DIALOG_CALLBACK_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/find_handler_ctocpp.h b/libcef_dll/ctocpp/find_handler_ctocpp.h index f05b10e1..47570770 100644 --- a/libcef_dll/ctocpp/find_handler_ctocpp.h +++ b/libcef_dll/ctocpp/find_handler_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_FIND_HANDLER_CTOCPP_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/cef_find_handler.h" #include "include/capi/cef_find_handler_capi.h" @@ -36,5 +36,4 @@ class CefFindHandlerCToCpp bool finalUpdate) override; }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_FIND_HANDLER_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/focus_handler_ctocpp.h b/libcef_dll/ctocpp/focus_handler_ctocpp.h index ba8a7e55..c3edd41b 100644 --- a/libcef_dll/ctocpp/focus_handler_ctocpp.h +++ b/libcef_dll/ctocpp/focus_handler_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_FOCUS_HANDLER_CTOCPP_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/cef_focus_handler.h" #include "include/capi/cef_focus_handler_capi.h" @@ -36,5 +36,4 @@ class CefFocusHandlerCToCpp void OnGotFocus(CefRefPtr browser) override; }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_FOCUS_HANDLER_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/frame_ctocpp.h b/libcef_dll/ctocpp/frame_ctocpp.h index dde6c71d..69a32b46 100644 --- a/libcef_dll/ctocpp/frame_ctocpp.h +++ b/libcef_dll/ctocpp/frame_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_FRAME_CTOCPP_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/cef_frame.h" #include "include/capi/cef_frame_capi.h" @@ -61,5 +61,4 @@ class CefFrameCToCpp void VisitDOM(CefRefPtr visitor) OVERRIDE; }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_FRAME_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/geolocation_callback_ctocpp.h b/libcef_dll/ctocpp/geolocation_callback_ctocpp.h index cdaa2a9a..f25c7a71 100644 --- a/libcef_dll/ctocpp/geolocation_callback_ctocpp.h +++ b/libcef_dll/ctocpp/geolocation_callback_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_GEOLOCATION_CALLBACK_CTOCPP_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/cef_geolocation_handler.h" #include "include/capi/cef_geolocation_handler_capi.h" @@ -34,5 +34,4 @@ class CefGeolocationCallbackCToCpp void Continue(bool allow) OVERRIDE; }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_GEOLOCATION_CALLBACK_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/geolocation_handler_ctocpp.h b/libcef_dll/ctocpp/geolocation_handler_ctocpp.h index f1aa6c2a..6a7b887b 100644 --- a/libcef_dll/ctocpp/geolocation_handler_ctocpp.h +++ b/libcef_dll/ctocpp/geolocation_handler_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_GEOLOCATION_HANDLER_CTOCPP_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/cef_geolocation_handler.h" #include "include/capi/cef_geolocation_handler_capi.h" @@ -38,5 +38,4 @@ class CefGeolocationHandlerCToCpp int request_id) override; }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_GEOLOCATION_HANDLER_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/get_geolocation_callback_ctocpp.h b/libcef_dll/ctocpp/get_geolocation_callback_ctocpp.h index 3d9d3d71..b8547f5b 100644 --- a/libcef_dll/ctocpp/get_geolocation_callback_ctocpp.h +++ b/libcef_dll/ctocpp/get_geolocation_callback_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_GET_GEOLOCATION_CALLBACK_CTOCPP_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/cef_geolocation.h" #include "include/capi/cef_geolocation_capi.h" @@ -34,5 +34,4 @@ class CefGetGeolocationCallbackCToCpp void OnLocationUpdate(const CefGeoposition& position) override; }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_GET_GEOLOCATION_CALLBACK_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/image_ctocpp.h b/libcef_dll/ctocpp/image_ctocpp.h index 79168f70..42b0aca3 100644 --- a/libcef_dll/ctocpp/image_ctocpp.h +++ b/libcef_dll/ctocpp/image_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_IMAGE_CTOCPP_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/cef_image.h" #include "include/capi/cef_image_capi.h" @@ -54,5 +54,4 @@ class CefImageCToCpp int& pixel_width, int& pixel_height) OVERRIDE; }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_IMAGE_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/jsdialog_callback_ctocpp.h b/libcef_dll/ctocpp/jsdialog_callback_ctocpp.h index 3acbf84a..4a68637f 100644 --- a/libcef_dll/ctocpp/jsdialog_callback_ctocpp.h +++ b/libcef_dll/ctocpp/jsdialog_callback_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_JSDIALOG_CALLBACK_CTOCPP_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/cef_jsdialog_handler.h" #include "include/capi/cef_jsdialog_handler_capi.h" @@ -34,5 +34,4 @@ class CefJSDialogCallbackCToCpp void Continue(bool success, const CefString& user_input) OVERRIDE; }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_JSDIALOG_CALLBACK_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/jsdialog_handler_ctocpp.h b/libcef_dll/ctocpp/jsdialog_handler_ctocpp.h index f9ebeba9..bb3ea964 100644 --- a/libcef_dll/ctocpp/jsdialog_handler_ctocpp.h +++ b/libcef_dll/ctocpp/jsdialog_handler_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_JSDIALOG_HANDLER_CTOCPP_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/cef_jsdialog_handler.h" #include "include/capi/cef_jsdialog_handler_capi.h" @@ -43,5 +43,4 @@ class CefJSDialogHandlerCToCpp void OnDialogClosed(CefRefPtr browser) override; }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_JSDIALOG_HANDLER_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/keyboard_handler_ctocpp.h b/libcef_dll/ctocpp/keyboard_handler_ctocpp.h index d341b490..f446555f 100644 --- a/libcef_dll/ctocpp/keyboard_handler_ctocpp.h +++ b/libcef_dll/ctocpp/keyboard_handler_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_KEYBOARD_HANDLER_CTOCPP_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/cef_keyboard_handler.h" #include "include/capi/cef_keyboard_handler_capi.h" @@ -37,5 +37,4 @@ class CefKeyboardHandlerCToCpp CefEventHandle os_event) override; }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_KEYBOARD_HANDLER_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/life_span_handler_ctocpp.h b/libcef_dll/ctocpp/life_span_handler_ctocpp.h index 736ae42a..3d72dc67 100644 --- a/libcef_dll/ctocpp/life_span_handler_ctocpp.h +++ b/libcef_dll/ctocpp/life_span_handler_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_LIFE_SPAN_HANDLER_CTOCPP_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/cef_life_span_handler.h" #include "include/capi/cef_life_span_handler_capi.h" @@ -44,5 +44,4 @@ class CefLifeSpanHandlerCToCpp void OnBeforeClose(CefRefPtr browser) override; }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_LIFE_SPAN_HANDLER_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/list_value_ctocpp.h b/libcef_dll/ctocpp/list_value_ctocpp.h index 9a7d4458..31ce8765 100644 --- a/libcef_dll/ctocpp/list_value_ctocpp.h +++ b/libcef_dll/ctocpp/list_value_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_LIST_VALUE_CTOCPP_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/cef_values.h" #include "include/capi/cef_values_capi.h" @@ -61,5 +61,4 @@ class CefListValueCToCpp bool SetList(size_t index, CefRefPtr value) OVERRIDE; }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_LIST_VALUE_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/load_handler_ctocpp.h b/libcef_dll/ctocpp/load_handler_ctocpp.h index 3a58492e..4675c655 100644 --- a/libcef_dll/ctocpp/load_handler_ctocpp.h +++ b/libcef_dll/ctocpp/load_handler_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_LOAD_HANDLER_CTOCPP_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/cef_load_handler.h" #include "include/capi/cef_load_handler_capi.h" @@ -42,5 +42,4 @@ class CefLoadHandlerCToCpp const CefString& failedUrl) override; }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_LOAD_HANDLER_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/menu_model_ctocpp.h b/libcef_dll/ctocpp/menu_model_ctocpp.h index 14585cfd..19e39c13 100644 --- a/libcef_dll/ctocpp/menu_model_ctocpp.h +++ b/libcef_dll/ctocpp/menu_model_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_MENU_MODEL_CTOCPP_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/cef_menu_model.h" #include "include/capi/cef_menu_model_capi.h" @@ -90,5 +90,4 @@ class CefMenuModelCToCpp bool& ctrl_pressed, bool& alt_pressed) OVERRIDE; }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_MENU_MODEL_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/menu_model_delegate_ctocpp.h b/libcef_dll/ctocpp/menu_model_delegate_ctocpp.h index 654d1414..1343198d 100644 --- a/libcef_dll/ctocpp/menu_model_delegate_ctocpp.h +++ b/libcef_dll/ctocpp/menu_model_delegate_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_MENU_MODEL_DELEGATE_CTOCPP_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/cef_menu_model_delegate.h" #include "include/capi/cef_menu_model_delegate_capi.h" @@ -41,5 +41,4 @@ class CefMenuModelDelegateCToCpp CefString& label) override; }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_MENU_MODEL_DELEGATE_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/navigation_entry_ctocpp.h b/libcef_dll/ctocpp/navigation_entry_ctocpp.h index f1665fd7..972cfc6b 100644 --- a/libcef_dll/ctocpp/navigation_entry_ctocpp.h +++ b/libcef_dll/ctocpp/navigation_entry_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_NAVIGATION_ENTRY_CTOCPP_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/cef_navigation_entry.h" #include "include/capi/cef_navigation_entry_capi.h" @@ -43,5 +43,4 @@ class CefNavigationEntryCToCpp CefRefPtr GetSSLStatus() OVERRIDE; }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_NAVIGATION_ENTRY_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/navigation_entry_visitor_ctocpp.h b/libcef_dll/ctocpp/navigation_entry_visitor_ctocpp.h index bd0ed206..38664e98 100644 --- a/libcef_dll/ctocpp/navigation_entry_visitor_ctocpp.h +++ b/libcef_dll/ctocpp/navigation_entry_visitor_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_NAVIGATION_ENTRY_VISITOR_CTOCPP_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/cef_browser.h" #include "include/capi/cef_browser_capi.h" @@ -37,5 +37,4 @@ class CefNavigationEntryVisitorCToCpp int total) override; }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_NAVIGATION_ENTRY_VISITOR_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/pdf_print_callback_ctocpp.h b/libcef_dll/ctocpp/pdf_print_callback_ctocpp.h index 7cdb6814..4fda8b5c 100644 --- a/libcef_dll/ctocpp/pdf_print_callback_ctocpp.h +++ b/libcef_dll/ctocpp/pdf_print_callback_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_PDF_PRINT_CALLBACK_CTOCPP_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/cef_browser.h" #include "include/capi/cef_browser_capi.h" @@ -36,5 +36,4 @@ class CefPdfPrintCallbackCToCpp void OnPdfPrintFinished(const CefString& path, bool ok) override; }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_PDF_PRINT_CALLBACK_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/post_data_ctocpp.h b/libcef_dll/ctocpp/post_data_ctocpp.h index d57a0f87..9d371807 100644 --- a/libcef_dll/ctocpp/post_data_ctocpp.h +++ b/libcef_dll/ctocpp/post_data_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_POST_DATA_CTOCPP_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/cef_request.h" #include "include/capi/cef_request_capi.h" @@ -39,5 +39,4 @@ class CefPostDataCToCpp void RemoveElements() OVERRIDE; }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_POST_DATA_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/post_data_element_ctocpp.h b/libcef_dll/ctocpp/post_data_element_ctocpp.h index 0a6f0498..5d41884f 100644 --- a/libcef_dll/ctocpp/post_data_element_ctocpp.h +++ b/libcef_dll/ctocpp/post_data_element_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_POST_DATA_ELEMENT_CTOCPP_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/cef_request.h" #include "include/capi/cef_request_capi.h" @@ -41,5 +41,4 @@ class CefPostDataElementCToCpp size_t GetBytes(size_t size, void* bytes) OVERRIDE; }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_POST_DATA_ELEMENT_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/print_dialog_callback_ctocpp.h b/libcef_dll/ctocpp/print_dialog_callback_ctocpp.h index 6da471b5..4523864c 100644 --- a/libcef_dll/ctocpp/print_dialog_callback_ctocpp.h +++ b/libcef_dll/ctocpp/print_dialog_callback_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_PRINT_DIALOG_CALLBACK_CTOCPP_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/cef_print_handler.h" #include "include/capi/cef_print_handler_capi.h" @@ -35,5 +35,4 @@ class CefPrintDialogCallbackCToCpp void Cancel() OVERRIDE; }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_PRINT_DIALOG_CALLBACK_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/print_handler_ctocpp.h b/libcef_dll/ctocpp/print_handler_ctocpp.h index 86e427e9..7515f90f 100644 --- a/libcef_dll/ctocpp/print_handler_ctocpp.h +++ b/libcef_dll/ctocpp/print_handler_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_PRINT_HANDLER_CTOCPP_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/cef_print_handler.h" #include "include/capi/cef_print_handler_capi.h" @@ -43,5 +43,4 @@ class CefPrintHandlerCToCpp CefSize GetPdfPaperSize(int device_units_per_inch) override; }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_PRINT_HANDLER_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/print_job_callback_ctocpp.h b/libcef_dll/ctocpp/print_job_callback_ctocpp.h index 27491944..fbe2b5e9 100644 --- a/libcef_dll/ctocpp/print_job_callback_ctocpp.h +++ b/libcef_dll/ctocpp/print_job_callback_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_PRINT_JOB_CALLBACK_CTOCPP_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/cef_print_handler.h" #include "include/capi/cef_print_handler_capi.h" @@ -34,5 +34,4 @@ class CefPrintJobCallbackCToCpp void Continue() OVERRIDE; }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_PRINT_JOB_CALLBACK_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/print_settings_ctocpp.h b/libcef_dll/ctocpp/print_settings_ctocpp.h index 018be1a0..4100435a 100644 --- a/libcef_dll/ctocpp/print_settings_ctocpp.h +++ b/libcef_dll/ctocpp/print_settings_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_PRINT_SETTINGS_CTOCPP_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/cef_print_settings.h" #include "include/capi/cef_print_settings_capi.h" @@ -58,5 +58,4 @@ class CefPrintSettingsCToCpp DuplexMode GetDuplexMode() OVERRIDE; }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_PRINT_SETTINGS_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/process_message_ctocpp.h b/libcef_dll/ctocpp/process_message_ctocpp.h index 9abc2143..78f27f05 100644 --- a/libcef_dll/ctocpp/process_message_ctocpp.h +++ b/libcef_dll/ctocpp/process_message_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_PROCESS_MESSAGE_CTOCPP_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/cef_process_message.h" #include "include/capi/cef_process_message_capi.h" @@ -38,5 +38,4 @@ class CefProcessMessageCToCpp CefRefPtr GetArgumentList() OVERRIDE; }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_PROCESS_MESSAGE_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/read_handler_ctocpp.h b/libcef_dll/ctocpp/read_handler_ctocpp.h index dff29880..42608761 100644 --- a/libcef_dll/ctocpp/read_handler_ctocpp.h +++ b/libcef_dll/ctocpp/read_handler_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_READ_HANDLER_CTOCPP_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/cef_stream.h" #include "include/capi/cef_stream_capi.h" @@ -38,5 +38,4 @@ class CefReadHandlerCToCpp bool MayBlock() override; }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_READ_HANDLER_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/register_cdm_callback_ctocpp.h b/libcef_dll/ctocpp/register_cdm_callback_ctocpp.h index 9f7a3b62..ccdbc681 100644 --- a/libcef_dll/ctocpp/register_cdm_callback_ctocpp.h +++ b/libcef_dll/ctocpp/register_cdm_callback_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_REGISTER_CDM_CALLBACK_CTOCPP_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/cef_web_plugin.h" #include "include/capi/cef_web_plugin_capi.h" @@ -37,5 +37,4 @@ class CefRegisterCdmCallbackCToCpp const CefString& error_message) override; }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_REGISTER_CDM_CALLBACK_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/render_handler_ctocpp.h b/libcef_dll/ctocpp/render_handler_ctocpp.h index 31b9d378..9b6595f0 100644 --- a/libcef_dll/ctocpp/render_handler_ctocpp.h +++ b/libcef_dll/ctocpp/render_handler_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_RENDER_HANDLER_CTOCPP_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/cef_render_handler.h" #include "include/capi/cef_render_handler_capi.h" @@ -56,5 +56,4 @@ class CefRenderHandlerCToCpp const RectList& character_bounds) override; }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_RENDER_HANDLER_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/render_process_handler_ctocpp.h b/libcef_dll/ctocpp/render_process_handler_ctocpp.h index 6e825f6a..7cfe7d57 100644 --- a/libcef_dll/ctocpp/render_process_handler_ctocpp.h +++ b/libcef_dll/ctocpp/render_process_handler_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_RENDER_PROCESS_HANDLER_CTOCPP_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/cef_render_process_handler.h" #include "include/capi/cef_render_process_handler_capi.h" @@ -54,5 +54,4 @@ class CefRenderProcessHandlerCToCpp CefRefPtr message) override; }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_RENDER_PROCESS_HANDLER_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/request_callback_ctocpp.h b/libcef_dll/ctocpp/request_callback_ctocpp.h index 21314db9..d47a2171 100644 --- a/libcef_dll/ctocpp/request_callback_ctocpp.h +++ b/libcef_dll/ctocpp/request_callback_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_REQUEST_CALLBACK_CTOCPP_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/cef_request_handler.h" #include "include/capi/cef_request_handler_capi.h" @@ -35,5 +35,4 @@ class CefRequestCallbackCToCpp void Cancel() OVERRIDE; }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_REQUEST_CALLBACK_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/request_context_ctocpp.h b/libcef_dll/ctocpp/request_context_ctocpp.h index bbce628c..ecbfaa71 100644 --- a/libcef_dll/ctocpp/request_context_ctocpp.h +++ b/libcef_dll/ctocpp/request_context_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_REQUEST_CONTEXT_CTOCPP_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include #include "include/cef_request_context.h" @@ -62,5 +62,4 @@ class CefRequestContextCToCpp std::vector& resolved_ips) OVERRIDE; }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_REQUEST_CONTEXT_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/request_context_handler_ctocpp.h b/libcef_dll/ctocpp/request_context_handler_ctocpp.h index 79c9ded5..1b5b3f78 100644 --- a/libcef_dll/ctocpp/request_context_handler_ctocpp.h +++ b/libcef_dll/ctocpp/request_context_handler_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_REQUEST_CONTEXT_HANDLER_CTOCPP_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/cef_request_context_handler.h" #include "include/capi/cef_request_context_handler_capi.h" @@ -38,5 +38,4 @@ class CefRequestContextHandlerCToCpp PluginPolicy* plugin_policy) override; }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_REQUEST_CONTEXT_HANDLER_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/request_ctocpp.h b/libcef_dll/ctocpp/request_ctocpp.h index 663a8c37..17f9da33 100644 --- a/libcef_dll/ctocpp/request_ctocpp.h +++ b/libcef_dll/ctocpp/request_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_REQUEST_CTOCPP_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/cef_request.h" #include "include/capi/cef_request_capi.h" @@ -54,5 +54,4 @@ class CefRequestCToCpp uint64 GetIdentifier() OVERRIDE; }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_REQUEST_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/request_handler_ctocpp.h b/libcef_dll/ctocpp/request_handler_ctocpp.h index 6052082a..6bfdc550 100644 --- a/libcef_dll/ctocpp/request_handler_ctocpp.h +++ b/libcef_dll/ctocpp/request_handler_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_REQUEST_HANDLER_CTOCPP_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/cef_request_handler.h" #include "include/capi/cef_request_handler_capi.h" @@ -79,5 +79,4 @@ class CefRequestHandlerCToCpp TerminationStatus status) override; }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_REQUEST_HANDLER_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/resolve_callback_ctocpp.h b/libcef_dll/ctocpp/resolve_callback_ctocpp.h index d8384fbc..0da81352 100644 --- a/libcef_dll/ctocpp/resolve_callback_ctocpp.h +++ b/libcef_dll/ctocpp/resolve_callback_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_RESOLVE_CALLBACK_CTOCPP_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include #include "include/cef_request_context.h" @@ -38,5 +38,4 @@ class CefResolveCallbackCToCpp const std::vector& resolved_ips) override; }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_RESOLVE_CALLBACK_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/resource_bundle_ctocpp.h b/libcef_dll/ctocpp/resource_bundle_ctocpp.h index 0ada75fa..82269599 100644 --- a/libcef_dll/ctocpp/resource_bundle_ctocpp.h +++ b/libcef_dll/ctocpp/resource_bundle_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_RESOURCE_BUNDLE_CTOCPP_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/cef_resource_bundle.h" #include "include/capi/cef_resource_bundle_capi.h" @@ -38,5 +38,4 @@ class CefResourceBundleCToCpp void*& data, size_t& data_size) OVERRIDE; }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_RESOURCE_BUNDLE_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/resource_bundle_handler_ctocpp.h b/libcef_dll/ctocpp/resource_bundle_handler_ctocpp.h index 14ef9938..4840051e 100644 --- a/libcef_dll/ctocpp/resource_bundle_handler_ctocpp.h +++ b/libcef_dll/ctocpp/resource_bundle_handler_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_RESOURCE_BUNDLE_HANDLER_CTOCPP_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/cef_resource_bundle_handler.h" #include "include/capi/cef_resource_bundle_handler_capi.h" @@ -38,5 +38,4 @@ class CefResourceBundleHandlerCToCpp void*& data, size_t& data_size) override; }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_RESOURCE_BUNDLE_HANDLER_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/resource_handler_ctocpp.h b/libcef_dll/ctocpp/resource_handler_ctocpp.h index adffa30b..d4989ba7 100644 --- a/libcef_dll/ctocpp/resource_handler_ctocpp.h +++ b/libcef_dll/ctocpp/resource_handler_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_RESOURCE_HANDLER_CTOCPP_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/cef_resource_handler.h" #include "include/capi/cef_resource_handler_capi.h" @@ -42,5 +42,4 @@ class CefResourceHandlerCToCpp void Cancel() override; }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_RESOURCE_HANDLER_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/response_ctocpp.h b/libcef_dll/ctocpp/response_ctocpp.h index 6611007e..3467ee64 100644 --- a/libcef_dll/ctocpp/response_ctocpp.h +++ b/libcef_dll/ctocpp/response_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_RESPONSE_CTOCPP_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/cef_response.h" #include "include/capi/cef_response_capi.h" @@ -44,5 +44,4 @@ class CefResponseCToCpp void SetHeaderMap(const HeaderMap& headerMap) OVERRIDE; }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_RESPONSE_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/response_filter_ctocpp.h b/libcef_dll/ctocpp/response_filter_ctocpp.h index 1d2535a4..809d330d 100644 --- a/libcef_dll/ctocpp/response_filter_ctocpp.h +++ b/libcef_dll/ctocpp/response_filter_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_RESPONSE_FILTER_CTOCPP_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/cef_response_filter.h" #include "include/capi/cef_response_filter_capi.h" @@ -37,5 +37,4 @@ class CefResponseFilterCToCpp size_t& data_out_written) override; }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_RESPONSE_FILTER_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/run_context_menu_callback_ctocpp.h b/libcef_dll/ctocpp/run_context_menu_callback_ctocpp.h index a96acc6f..7c066da4 100644 --- a/libcef_dll/ctocpp/run_context_menu_callback_ctocpp.h +++ b/libcef_dll/ctocpp/run_context_menu_callback_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_RUN_CONTEXT_MENU_CALLBACK_CTOCPP_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/cef_context_menu_handler.h" #include "include/capi/cef_context_menu_handler_capi.h" @@ -35,5 +35,4 @@ class CefRunContextMenuCallbackCToCpp void Cancel() OVERRIDE; }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_RUN_CONTEXT_MENU_CALLBACK_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/run_file_dialog_callback_ctocpp.h b/libcef_dll/ctocpp/run_file_dialog_callback_ctocpp.h index a4d62bd7..b88ff89f 100644 --- a/libcef_dll/ctocpp/run_file_dialog_callback_ctocpp.h +++ b/libcef_dll/ctocpp/run_file_dialog_callback_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_RUN_FILE_DIALOG_CALLBACK_CTOCPP_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include #include "include/cef_browser.h" @@ -38,5 +38,4 @@ class CefRunFileDialogCallbackCToCpp const std::vector& file_paths) override; }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_RUN_FILE_DIALOG_CALLBACK_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/scheme_handler_factory_ctocpp.h b/libcef_dll/ctocpp/scheme_handler_factory_ctocpp.h index 26300dda..21c741e4 100644 --- a/libcef_dll/ctocpp/scheme_handler_factory_ctocpp.h +++ b/libcef_dll/ctocpp/scheme_handler_factory_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_SCHEME_HANDLER_FACTORY_CTOCPP_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/cef_scheme.h" #include "include/capi/cef_scheme_capi.h" @@ -36,5 +36,4 @@ class CefSchemeHandlerFactoryCToCpp CefRefPtr request) override; }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_SCHEME_HANDLER_FACTORY_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/scheme_registrar_ctocpp.h b/libcef_dll/ctocpp/scheme_registrar_ctocpp.h index ea66e632..117901ee 100644 --- a/libcef_dll/ctocpp/scheme_registrar_ctocpp.h +++ b/libcef_dll/ctocpp/scheme_registrar_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_SCHEME_REGISTRAR_CTOCPP_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/cef_scheme.h" #include "include/capi/cef_scheme_capi.h" @@ -35,5 +35,4 @@ class CefSchemeRegistrarCToCpp bool is_local, bool is_display_isolated) OVERRIDE; }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_SCHEME_REGISTRAR_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/select_client_certificate_callback_ctocpp.h b/libcef_dll/ctocpp/select_client_certificate_callback_ctocpp.h index a5e4c056..feade484 100644 --- a/libcef_dll/ctocpp/select_client_certificate_callback_ctocpp.h +++ b/libcef_dll/ctocpp/select_client_certificate_callback_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_SELECT_CLIENT_CERTIFICATE_CALLBACK_CTOCPP_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/cef_request_handler.h" #include "include/capi/cef_request_handler_capi.h" @@ -35,5 +35,4 @@ class CefSelectClientCertificateCallbackCToCpp void Select(CefRefPtr cert) OVERRIDE; }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_SELECT_CLIENT_CERTIFICATE_CALLBACK_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/set_cookie_callback_ctocpp.h b/libcef_dll/ctocpp/set_cookie_callback_ctocpp.h index 445ac9bf..8ce2b205 100644 --- a/libcef_dll/ctocpp/set_cookie_callback_ctocpp.h +++ b/libcef_dll/ctocpp/set_cookie_callback_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_SET_COOKIE_CALLBACK_CTOCPP_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/cef_cookie.h" #include "include/capi/cef_cookie_capi.h" @@ -34,5 +34,4 @@ class CefSetCookieCallbackCToCpp void OnComplete(bool success) override; }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_SET_COOKIE_CALLBACK_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/sslinfo_ctocpp.h b/libcef_dll/ctocpp/sslinfo_ctocpp.h index 57fbbc36..5582c6d4 100644 --- a/libcef_dll/ctocpp/sslinfo_ctocpp.h +++ b/libcef_dll/ctocpp/sslinfo_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_SSLINFO_CTOCPP_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/cef_ssl_info.h" #include "include/capi/cef_ssl_info_capi.h" @@ -34,5 +34,4 @@ class CefSSLInfoCToCpp CefRefPtr GetX509Certificate() OVERRIDE; }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_SSLINFO_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/sslstatus_ctocpp.h b/libcef_dll/ctocpp/sslstatus_ctocpp.h index d6f953b4..92c5ff21 100644 --- a/libcef_dll/ctocpp/sslstatus_ctocpp.h +++ b/libcef_dll/ctocpp/sslstatus_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_SSLSTATUS_CTOCPP_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/cef_ssl_status.h" #include "include/capi/cef_ssl_status_capi.h" @@ -37,5 +37,4 @@ class CefSSLStatusCToCpp CefRefPtr GetX509Certificate() OVERRIDE; }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_SSLSTATUS_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/stream_reader_ctocpp.h b/libcef_dll/ctocpp/stream_reader_ctocpp.h index 0751cd57..958748d9 100644 --- a/libcef_dll/ctocpp/stream_reader_ctocpp.h +++ b/libcef_dll/ctocpp/stream_reader_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_STREAM_READER_CTOCPP_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/cef_stream.h" #include "include/capi/cef_stream_capi.h" @@ -38,5 +38,4 @@ class CefStreamReaderCToCpp bool MayBlock() OVERRIDE; }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_STREAM_READER_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/stream_writer_ctocpp.h b/libcef_dll/ctocpp/stream_writer_ctocpp.h index fb6ae06e..06e6ff87 100644 --- a/libcef_dll/ctocpp/stream_writer_ctocpp.h +++ b/libcef_dll/ctocpp/stream_writer_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_STREAM_WRITER_CTOCPP_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/cef_stream.h" #include "include/capi/cef_stream_capi.h" @@ -38,5 +38,4 @@ class CefStreamWriterCToCpp bool MayBlock() OVERRIDE; }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_STREAM_WRITER_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/string_visitor_ctocpp.h b/libcef_dll/ctocpp/string_visitor_ctocpp.h index 8ae1662e..4fde4593 100644 --- a/libcef_dll/ctocpp/string_visitor_ctocpp.h +++ b/libcef_dll/ctocpp/string_visitor_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_STRING_VISITOR_CTOCPP_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/cef_string_visitor.h" #include "include/capi/cef_string_visitor_capi.h" @@ -34,5 +34,4 @@ class CefStringVisitorCToCpp void Visit(const CefString& string) override; }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_STRING_VISITOR_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/task_ctocpp.h b/libcef_dll/ctocpp/task_ctocpp.h index 8a4323b9..6dc4e090 100644 --- a/libcef_dll/ctocpp/task_ctocpp.h +++ b/libcef_dll/ctocpp/task_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_TASK_CTOCPP_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/cef_task.h" #include "include/capi/cef_task_capi.h" @@ -33,5 +33,4 @@ class CefTaskCToCpp void Execute() override; }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_TASK_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/task_runner_ctocpp.h b/libcef_dll/ctocpp/task_runner_ctocpp.h index 10a7b196..a3ec1fb2 100644 --- a/libcef_dll/ctocpp/task_runner_ctocpp.h +++ b/libcef_dll/ctocpp/task_runner_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_TASK_RUNNER_CTOCPP_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/cef_task.h" #include "include/capi/cef_task_capi.h" @@ -37,5 +37,4 @@ class CefTaskRunnerCToCpp bool PostDelayedTask(CefRefPtr task, int64 delay_ms) OVERRIDE; }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_TASK_RUNNER_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/test/translator_test_ctocpp.h b/libcef_dll/ctocpp/test/translator_test_ctocpp.h index 65ee6fb3..dfd59d78 100644 --- a/libcef_dll/ctocpp/test/translator_test_ctocpp.h +++ b/libcef_dll/ctocpp/test/translator_test_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_TEST_TRANSLATOR_TEST_CTOCPP_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include #include @@ -90,5 +90,4 @@ class CefTranslatorTestCToCpp size_t GetHandlerListSize() OVERRIDE; }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_TEST_TRANSLATOR_TEST_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/test/translator_test_handler_child_ctocpp.h b/libcef_dll/ctocpp/test/translator_test_handler_child_ctocpp.h index 73c7487d..ab163a75 100644 --- a/libcef_dll/ctocpp/test/translator_test_handler_child_ctocpp.h +++ b/libcef_dll/ctocpp/test/translator_test_handler_child_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_TEST_TRANSLATOR_TEST_HANDLER_CHILD_CTOCPP_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/test/cef_translator_test.h" #include "include/capi/test/cef_translator_test_capi.h" @@ -37,5 +37,4 @@ class CefTranslatorTestHandlerChildCToCpp int GetValue() override; }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_TEST_TRANSLATOR_TEST_HANDLER_CHILD_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/test/translator_test_handler_ctocpp.h b/libcef_dll/ctocpp/test/translator_test_handler_ctocpp.h index 86f32e76..d6b50ba4 100644 --- a/libcef_dll/ctocpp/test/translator_test_handler_ctocpp.h +++ b/libcef_dll/ctocpp/test/translator_test_handler_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_TEST_TRANSLATOR_TEST_HANDLER_CTOCPP_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/test/cef_translator_test.h" #include "include/capi/test/cef_translator_test_capi.h" @@ -34,5 +34,4 @@ class CefTranslatorTestHandlerCToCpp int GetValue() override; }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_TEST_TRANSLATOR_TEST_HANDLER_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/test/translator_test_object_child_child_ctocpp.h b/libcef_dll/ctocpp/test/translator_test_object_child_child_ctocpp.h index 19cfc714..e9c15f96 100644 --- a/libcef_dll/ctocpp/test/translator_test_object_child_child_ctocpp.h +++ b/libcef_dll/ctocpp/test/translator_test_object_child_child_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_TEST_TRANSLATOR_TEST_OBJECT_CHILD_CHILD_CTOCPP_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/test/cef_translator_test.h" #include "include/capi/test/cef_translator_test_capi.h" @@ -44,5 +44,4 @@ class CefTranslatorTestObjectChildChildCToCpp void SetValue(int value) OVERRIDE; }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_TEST_TRANSLATOR_TEST_OBJECT_CHILD_CHILD_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/test/translator_test_object_child_ctocpp.h b/libcef_dll/ctocpp/test/translator_test_object_child_ctocpp.h index 73679d1a..d19ae9f5 100644 --- a/libcef_dll/ctocpp/test/translator_test_object_child_ctocpp.h +++ b/libcef_dll/ctocpp/test/translator_test_object_child_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_TEST_TRANSLATOR_TEST_OBJECT_CHILD_CTOCPP_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/test/cef_translator_test.h" #include "include/capi/test/cef_translator_test_capi.h" @@ -39,5 +39,4 @@ class CefTranslatorTestObjectChildCToCpp void SetValue(int value) OVERRIDE; }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_TEST_TRANSLATOR_TEST_OBJECT_CHILD_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/test/translator_test_object_ctocpp.h b/libcef_dll/ctocpp/test/translator_test_object_ctocpp.h index ded85242..3c7a9fd4 100644 --- a/libcef_dll/ctocpp/test/translator_test_object_ctocpp.h +++ b/libcef_dll/ctocpp/test/translator_test_object_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_TEST_TRANSLATOR_TEST_OBJECT_CTOCPP_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/test/cef_translator_test.h" #include "include/capi/test/cef_translator_test_capi.h" @@ -35,5 +35,4 @@ class CefTranslatorTestObjectCToCpp void SetValue(int value) OVERRIDE; }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_TEST_TRANSLATOR_TEST_OBJECT_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/thread_ctocpp.h b/libcef_dll/ctocpp/thread_ctocpp.h index 21ce8c8c..805eb169 100644 --- a/libcef_dll/ctocpp/thread_ctocpp.h +++ b/libcef_dll/ctocpp/thread_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_THREAD_CTOCPP_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/cef_thread.h" #include "include/capi/cef_thread_capi.h" @@ -36,5 +36,4 @@ class CefThreadCToCpp bool IsRunning() OVERRIDE; }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_THREAD_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/urlrequest_client_ctocpp.h b/libcef_dll/ctocpp/urlrequest_client_ctocpp.h index b678d685..cf5a1a86 100644 --- a/libcef_dll/ctocpp/urlrequest_client_ctocpp.h +++ b/libcef_dll/ctocpp/urlrequest_client_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_URLREQUEST_CLIENT_CTOCPP_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/cef_urlrequest.h" #include "include/capi/cef_urlrequest_capi.h" @@ -43,5 +43,4 @@ class CefURLRequestClientCToCpp CefRefPtr callback) override; }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_URLREQUEST_CLIENT_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/urlrequest_ctocpp.h b/libcef_dll/ctocpp/urlrequest_ctocpp.h index 35bcb76e..baa06cbb 100644 --- a/libcef_dll/ctocpp/urlrequest_ctocpp.h +++ b/libcef_dll/ctocpp/urlrequest_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_URLREQUEST_CTOCPP_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/cef_urlrequest.h" #include "include/capi/cef_urlrequest_capi.h" @@ -38,5 +38,4 @@ class CefURLRequestCToCpp void Cancel() OVERRIDE; }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_URLREQUEST_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/v8accessor_ctocpp.h b/libcef_dll/ctocpp/v8accessor_ctocpp.h index 445739cb..de08d8e3 100644 --- a/libcef_dll/ctocpp/v8accessor_ctocpp.h +++ b/libcef_dll/ctocpp/v8accessor_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_V8ACCESSOR_CTOCPP_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/cef_v8.h" #include "include/capi/cef_v8_capi.h" @@ -36,5 +36,4 @@ class CefV8AccessorCToCpp const CefRefPtr value, CefString& exception) override; }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_V8ACCESSOR_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/v8context_ctocpp.h b/libcef_dll/ctocpp/v8context_ctocpp.h index 2d065aa7..c7a122a0 100644 --- a/libcef_dll/ctocpp/v8context_ctocpp.h +++ b/libcef_dll/ctocpp/v8context_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_V8CONTEXT_CTOCPP_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/cef_v8.h" #include "include/capi/cef_v8_capi.h" @@ -43,5 +43,4 @@ class CefV8ContextCToCpp CefRefPtr& exception) OVERRIDE; }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_V8CONTEXT_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/v8exception_ctocpp.h b/libcef_dll/ctocpp/v8exception_ctocpp.h index 80470070..a1b25ebc 100644 --- a/libcef_dll/ctocpp/v8exception_ctocpp.h +++ b/libcef_dll/ctocpp/v8exception_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_V8EXCEPTION_CTOCPP_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/cef_v8.h" #include "include/capi/cef_v8_capi.h" @@ -41,5 +41,4 @@ class CefV8ExceptionCToCpp int GetEndColumn() OVERRIDE; }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_V8EXCEPTION_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/v8handler_ctocpp.h b/libcef_dll/ctocpp/v8handler_ctocpp.h index 8ab0e700..310b3a8d 100644 --- a/libcef_dll/ctocpp/v8handler_ctocpp.h +++ b/libcef_dll/ctocpp/v8handler_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_V8HANDLER_CTOCPP_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/cef_v8.h" #include "include/capi/cef_v8_capi.h" @@ -35,5 +35,4 @@ class CefV8HandlerCToCpp CefString& exception) override; }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_V8HANDLER_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/v8interceptor_ctocpp.h b/libcef_dll/ctocpp/v8interceptor_ctocpp.h index 1b70b825..f99d7f0f 100644 --- a/libcef_dll/ctocpp/v8interceptor_ctocpp.h +++ b/libcef_dll/ctocpp/v8interceptor_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_V8INTERCEPTOR_CTOCPP_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/cef_v8.h" #include "include/capi/cef_v8_capi.h" @@ -41,5 +41,4 @@ class CefV8InterceptorCToCpp const CefRefPtr value, CefString& exception) override; }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_V8INTERCEPTOR_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/v8stack_frame_ctocpp.h b/libcef_dll/ctocpp/v8stack_frame_ctocpp.h index cccca9e3..96e83ea8 100644 --- a/libcef_dll/ctocpp/v8stack_frame_ctocpp.h +++ b/libcef_dll/ctocpp/v8stack_frame_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_V8STACK_FRAME_CTOCPP_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/cef_v8.h" #include "include/capi/cef_v8_capi.h" @@ -41,5 +41,4 @@ class CefV8StackFrameCToCpp bool IsConstructor() OVERRIDE; }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_V8STACK_FRAME_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/v8stack_trace_ctocpp.h b/libcef_dll/ctocpp/v8stack_trace_ctocpp.h index 068ef05c..06ec4fcc 100644 --- a/libcef_dll/ctocpp/v8stack_trace_ctocpp.h +++ b/libcef_dll/ctocpp/v8stack_trace_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_V8STACK_TRACE_CTOCPP_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/cef_v8.h" #include "include/capi/cef_v8_capi.h" @@ -36,5 +36,4 @@ class CefV8StackTraceCToCpp CefRefPtr GetFrame(int index) OVERRIDE; }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_V8STACK_TRACE_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/v8value_ctocpp.h b/libcef_dll/ctocpp/v8value_ctocpp.h index e2300340..36e6e0ad 100644 --- a/libcef_dll/ctocpp/v8value_ctocpp.h +++ b/libcef_dll/ctocpp/v8value_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_V8VALUE_CTOCPP_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include #include "include/cef_v8.h" @@ -82,5 +82,4 @@ class CefV8ValueCToCpp const CefV8ValueList& arguments) OVERRIDE; }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_V8VALUE_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/value_ctocpp.h b/libcef_dll/ctocpp/value_ctocpp.h index e4d76cfe..87ed0096 100644 --- a/libcef_dll/ctocpp/value_ctocpp.h +++ b/libcef_dll/ctocpp/value_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_VALUE_CTOCPP_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/cef_values.h" #include "include/capi/cef_values_capi.h" @@ -54,5 +54,4 @@ class CefValueCToCpp bool SetList(CefRefPtr value) OVERRIDE; }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_VALUE_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/views/box_layout_ctocpp.h b/libcef_dll/ctocpp/views/box_layout_ctocpp.h index 0c5f9b08..3e2e151c 100644 --- a/libcef_dll/ctocpp/views/box_layout_ctocpp.h +++ b/libcef_dll/ctocpp/views/box_layout_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_VIEWS_BOX_LAYOUT_CTOCPP_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/views/cef_box_layout.h" #include "include/capi/views/cef_box_layout_capi.h" @@ -41,5 +41,4 @@ class CefBoxLayoutCToCpp bool IsValid() OVERRIDE; }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_VIEWS_BOX_LAYOUT_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/views/browser_view_ctocpp.h b/libcef_dll/ctocpp/views/browser_view_ctocpp.h index 3e51c3c7..6dcaafdc 100644 --- a/libcef_dll/ctocpp/views/browser_view_ctocpp.h +++ b/libcef_dll/ctocpp/views/browser_view_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_VIEWS_BROWSER_VIEW_CTOCPP_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/views/cef_browser_view.h" #include "include/capi/views/cef_browser_view_capi.h" @@ -82,5 +82,4 @@ class CefBrowserViewCToCpp bool ConvertPointFromView(CefRefPtr view, CefPoint& point) OVERRIDE; }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_VIEWS_BROWSER_VIEW_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/views/browser_view_delegate_ctocpp.h b/libcef_dll/ctocpp/views/browser_view_delegate_ctocpp.h index a85d8b3c..f9dbc222 100644 --- a/libcef_dll/ctocpp/views/browser_view_delegate_ctocpp.h +++ b/libcef_dll/ctocpp/views/browser_view_delegate_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_VIEWS_BROWSER_VIEW_DELEGATE_CTOCPP_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/views/cef_browser_view_delegate.h" #include "include/capi/views/cef_browser_view_delegate_capi.h" @@ -58,5 +58,4 @@ class CefBrowserViewDelegateCToCpp CefRefPtr child) override; }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_VIEWS_BROWSER_VIEW_DELEGATE_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/views/button_ctocpp.h b/libcef_dll/ctocpp/views/button_ctocpp.h index 82e17c03..11ea24ef 100644 --- a/libcef_dll/ctocpp/views/button_ctocpp.h +++ b/libcef_dll/ctocpp/views/button_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_VIEWS_BUTTON_CTOCPP_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/views/cef_button.h" #include "include/capi/views/cef_button_capi.h" @@ -87,5 +87,4 @@ class CefButtonCToCpp bool ConvertPointFromView(CefRefPtr view, CefPoint& point) OVERRIDE; }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_VIEWS_BUTTON_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/views/button_delegate_ctocpp.h b/libcef_dll/ctocpp/views/button_delegate_ctocpp.h index f89d426a..1909dd3b 100644 --- a/libcef_dll/ctocpp/views/button_delegate_ctocpp.h +++ b/libcef_dll/ctocpp/views/button_delegate_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_VIEWS_BUTTON_DELEGATE_CTOCPP_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/views/cef_button_delegate.h" #include "include/capi/views/cef_button_delegate_capi.h" @@ -46,5 +46,4 @@ class CefButtonDelegateCToCpp CefRefPtr child) override; }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_VIEWS_BUTTON_DELEGATE_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/views/display_ctocpp.h b/libcef_dll/ctocpp/views/display_ctocpp.h index 2dcb887d..d04baf6c 100644 --- a/libcef_dll/ctocpp/views/display_ctocpp.h +++ b/libcef_dll/ctocpp/views/display_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_VIEWS_DISPLAY_CTOCPP_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/views/cef_display.h" #include "include/capi/views/cef_display_capi.h" @@ -39,5 +39,4 @@ class CefDisplayCToCpp int GetRotation() OVERRIDE; }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_VIEWS_DISPLAY_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/views/fill_layout_ctocpp.h b/libcef_dll/ctocpp/views/fill_layout_ctocpp.h index d64822b0..d5c99f47 100644 --- a/libcef_dll/ctocpp/views/fill_layout_ctocpp.h +++ b/libcef_dll/ctocpp/views/fill_layout_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_VIEWS_FILL_LAYOUT_CTOCPP_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/views/cef_fill_layout.h" #include "include/capi/views/cef_fill_layout_capi.h" @@ -37,5 +37,4 @@ class CefFillLayoutCToCpp bool IsValid() OVERRIDE; }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_VIEWS_FILL_LAYOUT_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/views/label_button_ctocpp.h b/libcef_dll/ctocpp/views/label_button_ctocpp.h index ab3c0333..c8784cd3 100644 --- a/libcef_dll/ctocpp/views/label_button_ctocpp.h +++ b/libcef_dll/ctocpp/views/label_button_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_VIEWS_LABEL_BUTTON_CTOCPP_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/views/cef_label_button.h" #include "include/capi/views/cef_label_button_capi.h" @@ -102,5 +102,4 @@ class CefLabelButtonCToCpp bool ConvertPointFromView(CefRefPtr view, CefPoint& point) OVERRIDE; }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_VIEWS_LABEL_BUTTON_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/views/layout_ctocpp.h b/libcef_dll/ctocpp/views/layout_ctocpp.h index 3cfd0024..3778de4a 100644 --- a/libcef_dll/ctocpp/views/layout_ctocpp.h +++ b/libcef_dll/ctocpp/views/layout_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_VIEWS_LAYOUT_CTOCPP_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/views/cef_layout.h" #include "include/capi/views/cef_layout_capi.h" @@ -39,5 +39,4 @@ class CefLayoutCToCpp bool IsValid() OVERRIDE; }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_VIEWS_LAYOUT_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/views/menu_button_ctocpp.h b/libcef_dll/ctocpp/views/menu_button_ctocpp.h index ae39372a..88de5e98 100644 --- a/libcef_dll/ctocpp/views/menu_button_ctocpp.h +++ b/libcef_dll/ctocpp/views/menu_button_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_VIEWS_MENU_BUTTON_CTOCPP_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/views/cef_menu_button.h" #include "include/capi/views/cef_menu_button_capi.h" @@ -104,5 +104,4 @@ class CefMenuButtonCToCpp bool ConvertPointFromView(CefRefPtr view, CefPoint& point) OVERRIDE; }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_VIEWS_MENU_BUTTON_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/views/menu_button_delegate_ctocpp.h b/libcef_dll/ctocpp/views/menu_button_delegate_ctocpp.h index aa555018..d28ab9ce 100644 --- a/libcef_dll/ctocpp/views/menu_button_delegate_ctocpp.h +++ b/libcef_dll/ctocpp/views/menu_button_delegate_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_VIEWS_MENU_BUTTON_DELEGATE_CTOCPP_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/views/cef_menu_button_delegate.h" #include "include/capi/views/cef_menu_button_delegate_capi.h" @@ -50,5 +50,4 @@ class CefMenuButtonDelegateCToCpp CefRefPtr child) override; }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_VIEWS_MENU_BUTTON_DELEGATE_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/views/panel_ctocpp.h b/libcef_dll/ctocpp/views/panel_ctocpp.h index 785badee..06c816cb 100644 --- a/libcef_dll/ctocpp/views/panel_ctocpp.h +++ b/libcef_dll/ctocpp/views/panel_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_VIEWS_PANEL_CTOCPP_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/views/cef_panel.h" #include "include/capi/views/cef_panel_capi.h" @@ -101,5 +101,4 @@ class CefPanelCToCpp bool ConvertPointFromView(CefRefPtr view, CefPoint& point) OVERRIDE; }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_VIEWS_PANEL_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/views/panel_delegate_ctocpp.h b/libcef_dll/ctocpp/views/panel_delegate_ctocpp.h index f6783c93..9e475c30 100644 --- a/libcef_dll/ctocpp/views/panel_delegate_ctocpp.h +++ b/libcef_dll/ctocpp/views/panel_delegate_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_VIEWS_PANEL_DELEGATE_CTOCPP_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/views/cef_panel_delegate.h" #include "include/capi/views/cef_panel_delegate_capi.h" @@ -43,5 +43,4 @@ class CefPanelDelegateCToCpp CefRefPtr child) override; }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_VIEWS_PANEL_DELEGATE_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/views/scroll_view_ctocpp.h b/libcef_dll/ctocpp/views/scroll_view_ctocpp.h index 6cbd5139..a7075978 100644 --- a/libcef_dll/ctocpp/views/scroll_view_ctocpp.h +++ b/libcef_dll/ctocpp/views/scroll_view_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_VIEWS_SCROLL_VIEW_CTOCPP_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/views/cef_scroll_view.h" #include "include/capi/views/cef_scroll_view_capi.h" @@ -87,5 +87,4 @@ class CefScrollViewCToCpp bool ConvertPointFromView(CefRefPtr view, CefPoint& point) OVERRIDE; }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_VIEWS_SCROLL_VIEW_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/views/textfield_ctocpp.h b/libcef_dll/ctocpp/views/textfield_ctocpp.h index f73a9efd..a88da91b 100644 --- a/libcef_dll/ctocpp/views/textfield_ctocpp.h +++ b/libcef_dll/ctocpp/views/textfield_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_VIEWS_TEXTFIELD_CTOCPP_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/views/cef_textfield.h" #include "include/capi/views/cef_textfield_capi.h" @@ -112,5 +112,4 @@ class CefTextfieldCToCpp bool ConvertPointFromView(CefRefPtr view, CefPoint& point) OVERRIDE; }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_VIEWS_TEXTFIELD_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/views/textfield_delegate_ctocpp.h b/libcef_dll/ctocpp/views/textfield_delegate_ctocpp.h index c0ad0c93..4aa90830 100644 --- a/libcef_dll/ctocpp/views/textfield_delegate_ctocpp.h +++ b/libcef_dll/ctocpp/views/textfield_delegate_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_VIEWS_TEXTFIELD_DELEGATE_CTOCPP_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/views/cef_textfield_delegate.h" #include "include/capi/views/cef_textfield_delegate_capi.h" @@ -48,5 +48,4 @@ class CefTextfieldDelegateCToCpp CefRefPtr child) override; }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_VIEWS_TEXTFIELD_DELEGATE_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/views/view_ctocpp.h b/libcef_dll/ctocpp/views/view_ctocpp.h index 1a71d8d6..efa1aed6 100644 --- a/libcef_dll/ctocpp/views/view_ctocpp.h +++ b/libcef_dll/ctocpp/views/view_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_VIEWS_VIEW_CTOCPP_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/views/cef_view.h" #include "include/capi/views/cef_view_capi.h" @@ -90,5 +90,4 @@ class CefViewCToCpp bool ConvertPointFromView(CefRefPtr view, CefPoint& point) OVERRIDE; }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_VIEWS_VIEW_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/views/view_delegate_ctocpp.h b/libcef_dll/ctocpp/views/view_delegate_ctocpp.h index d04f0fcc..2a693096 100644 --- a/libcef_dll/ctocpp/views/view_delegate_ctocpp.h +++ b/libcef_dll/ctocpp/views/view_delegate_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_VIEWS_VIEW_DELEGATE_CTOCPP_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/views/cef_view_delegate.h" #include "include/capi/views/cef_view_delegate_capi.h" @@ -43,5 +43,4 @@ class CefViewDelegateCToCpp CefRefPtr child) override; }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_VIEWS_VIEW_DELEGATE_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/views/window_ctocpp.h b/libcef_dll/ctocpp/views/window_ctocpp.h index 1a3a8e94..78138872 100644 --- a/libcef_dll/ctocpp/views/window_ctocpp.h +++ b/libcef_dll/ctocpp/views/window_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_VIEWS_WINDOW_CTOCPP_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include #include "include/views/cef_window.h" @@ -133,5 +133,4 @@ class CefWindowCToCpp bool ConvertPointFromView(CefRefPtr view, CefPoint& point) OVERRIDE; }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_VIEWS_WINDOW_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/views/window_delegate_ctocpp.h b/libcef_dll/ctocpp/views/window_delegate_ctocpp.h index c9885916..f4f6378f 100644 --- a/libcef_dll/ctocpp/views/window_delegate_ctocpp.h +++ b/libcef_dll/ctocpp/views/window_delegate_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_VIEWS_WINDOW_DELEGATE_CTOCPP_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/views/cef_window_delegate.h" #include "include/capi/views/cef_window_delegate_capi.h" @@ -54,5 +54,4 @@ class CefWindowDelegateCToCpp CefRefPtr child) override; }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_VIEWS_WINDOW_DELEGATE_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/waitable_event_ctocpp.h b/libcef_dll/ctocpp/waitable_event_ctocpp.h index b9f42fed..b35d1a71 100644 --- a/libcef_dll/ctocpp/waitable_event_ctocpp.h +++ b/libcef_dll/ctocpp/waitable_event_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_WAITABLE_EVENT_CTOCPP_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/cef_waitable_event.h" #include "include/capi/cef_waitable_event_capi.h" @@ -38,5 +38,4 @@ class CefWaitableEventCToCpp bool TimedWait(int64 max_ms) OVERRIDE; }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_WAITABLE_EVENT_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/web_plugin_info_ctocpp.h b/libcef_dll/ctocpp/web_plugin_info_ctocpp.h index 96a65442..6e3ecd96 100644 --- a/libcef_dll/ctocpp/web_plugin_info_ctocpp.h +++ b/libcef_dll/ctocpp/web_plugin_info_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_WEB_PLUGIN_INFO_CTOCPP_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/cef_web_plugin.h" #include "include/capi/cef_web_plugin_capi.h" @@ -39,5 +39,4 @@ class CefWebPluginInfoCToCpp CefString GetDescription() OVERRIDE; }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_WEB_PLUGIN_INFO_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/web_plugin_info_visitor_ctocpp.h b/libcef_dll/ctocpp/web_plugin_info_visitor_ctocpp.h index 80ba1ef0..0ebca384 100644 --- a/libcef_dll/ctocpp/web_plugin_info_visitor_ctocpp.h +++ b/libcef_dll/ctocpp/web_plugin_info_visitor_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_WEB_PLUGIN_INFO_VISITOR_CTOCPP_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/cef_web_plugin.h" #include "include/capi/cef_web_plugin_capi.h" @@ -36,5 +36,4 @@ class CefWebPluginInfoVisitorCToCpp bool Visit(CefRefPtr info, int count, int total) override; }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_WEB_PLUGIN_INFO_VISITOR_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/web_plugin_unstable_callback_ctocpp.h b/libcef_dll/ctocpp/web_plugin_unstable_callback_ctocpp.h index 24d71260..de37956c 100644 --- a/libcef_dll/ctocpp/web_plugin_unstable_callback_ctocpp.h +++ b/libcef_dll/ctocpp/web_plugin_unstable_callback_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_WEB_PLUGIN_UNSTABLE_CALLBACK_CTOCPP_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/cef_web_plugin.h" #include "include/capi/cef_web_plugin_capi.h" @@ -36,5 +36,4 @@ class CefWebPluginUnstableCallbackCToCpp void IsUnstable(const CefString& path, bool unstable) override; }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_WEB_PLUGIN_UNSTABLE_CALLBACK_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/write_handler_ctocpp.h b/libcef_dll/ctocpp/write_handler_ctocpp.h index 00c5b352..afa4248e 100644 --- a/libcef_dll/ctocpp/write_handler_ctocpp.h +++ b/libcef_dll/ctocpp/write_handler_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_WRITE_HANDLER_CTOCPP_H_ #pragma once -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif #include "include/cef_stream.h" #include "include/capi/cef_stream_capi.h" @@ -38,5 +38,4 @@ class CefWriteHandlerCToCpp bool MayBlock() override; }; -#endif // BUILDING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_WRITE_HANDLER_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/x509cert_principal_ctocpp.h b/libcef_dll/ctocpp/x509cert_principal_ctocpp.h index 07dc7403..26a694e4 100644 --- a/libcef_dll/ctocpp/x509cert_principal_ctocpp.h +++ b/libcef_dll/ctocpp/x509cert_principal_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_X509CERT_PRINCIPAL_CTOCPP_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include #include "include/cef_x509_certificate.h" @@ -43,5 +43,4 @@ class CefX509CertPrincipalCToCpp void GetDomainComponents(std::vector& components) OVERRIDE; }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_X509CERT_PRINCIPAL_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/x509certificate_ctocpp.h b/libcef_dll/ctocpp/x509certificate_ctocpp.h index d5f2f024..b10891b5 100644 --- a/libcef_dll/ctocpp/x509certificate_ctocpp.h +++ b/libcef_dll/ctocpp/x509certificate_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_X509CERTIFICATE_CTOCPP_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/cef_x509_certificate.h" #include "include/capi/cef_x509_certificate_capi.h" @@ -43,5 +43,4 @@ class CefX509CertificateCToCpp void GetPEMEncodedIssuerChain(IssuerChainBinaryList& chain) OVERRIDE; }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_X509CERTIFICATE_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/xml_reader_ctocpp.h b/libcef_dll/ctocpp/xml_reader_ctocpp.h index 84a8e17b..f555c3d1 100644 --- a/libcef_dll/ctocpp/xml_reader_ctocpp.h +++ b/libcef_dll/ctocpp/xml_reader_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_XML_READER_CTOCPP_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/cef_xml_reader.h" #include "include/capi/cef_xml_reader_capi.h" @@ -63,5 +63,4 @@ class CefXmlReaderCToCpp bool MoveToCarryingElement() OVERRIDE; }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_XML_READER_CTOCPP_H_ diff --git a/libcef_dll/ctocpp/zip_reader_ctocpp.h b/libcef_dll/ctocpp/zip_reader_ctocpp.h index f2f6cffd..4395d719 100644 --- a/libcef_dll/ctocpp/zip_reader_ctocpp.h +++ b/libcef_dll/ctocpp/zip_reader_ctocpp.h @@ -14,9 +14,9 @@ #define CEF_LIBCEF_DLL_CTOCPP_ZIP_READER_CTOCPP_H_ #pragma once -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif #include "include/cef_zip_reader.h" #include "include/capi/cef_zip_reader_capi.h" @@ -44,5 +44,4 @@ class CefZipReaderCToCpp bool Eof() OVERRIDE; }; -#endif // USING_CEF_SHARED #endif // CEF_LIBCEF_DLL_CTOCPP_ZIP_READER_CTOCPP_H_ diff --git a/tests/cefclient/CMakeLists.txt.in b/tests/cefclient/CMakeLists.txt.in index e0a84d4a..c9f93791 100644 --- a/tests/cefclient/CMakeLists.txt.in +++ b/tests/cefclient/CMakeLists.txt.in @@ -11,6 +11,7 @@ 'prefix': 'cefclient_browser', 'set': 'CEFCLIENT_BROWSER_SRCS', 'includes': [ + 'shared_sources_browser', 'cefclient_sources_browser', ], }} @@ -20,6 +21,7 @@ 'prefix': 'cefclient_common', 'set': 'CEFCLIENT_COMMON_SRCS', 'includes': [ + 'shared_sources_common', 'cefclient_sources_common', ], }} @@ -29,6 +31,7 @@ 'prefix': 'cefclient_renderer', 'set': 'CEFCLIENT_RENDERER_SRCS', 'includes': [ + 'shared_sources_renderer', 'cefclient_sources_renderer', ], }} @@ -38,6 +41,7 @@ 'prefix': 'cefclient_linux', 'set': 'CEFCLIENT_LINUX_SRCS', 'includes': [ + 'shared_sources_linux', 'cefclient_sources_linux', ], }} @@ -47,6 +51,7 @@ 'prefix': 'cefclient_macosx', 'set': 'CEFCLIENT_MACOSX_SRCS', 'includes': [ + 'shared_sources_mac', 'cefclient_sources_mac', ], }} @@ -56,7 +61,7 @@ 'prefix': 'cefclient_helper', 'set': 'CEFCLIENT_MACOSX_HELPER_SRCS', 'includes': [ - 'cefclient_sources_mac_helper', + 'shared_sources_mac_helper', ], }} @@ -65,6 +70,7 @@ 'prefix': 'cefclient_windows', 'set': 'CEFCLIENT_WINDOWS_SRCS', 'includes': [ + 'shared_sources_win', 'cefclient_sources_win', ], }} @@ -74,6 +80,7 @@ 'prefix': 'cefclient_resources', 'set': 'CEFCLIENT_RESOURCES_SRCS', 'includes': [ + 'shared_sources_resources', 'cefclient_bundle_resources_mac:MACOSX', 'cefclient_sources_resources', ], @@ -131,9 +138,7 @@ if(OS_LINUX) COPY_FILES("${CEF_TARGET}" "${CEF_RESOURCE_FILES}" "${CEF_RESOURCE_DIR}" "${CEF_TARGET_OUT_DIR}") # Copy cefclient resource files to the target output directory. - COPY_FILES("${CEF_TARGET}" "${CEFCLIENT_RESOURCES_SRCS}" "${CMAKE_CURRENT_SOURCE_DIR}" "${CEF_TARGET_OUT_DIR}") - # Rename the "res" directory to "files". - RENAME_DIRECTORY("${CEF_TARGET}" "${CEF_TARGET_OUT_DIR}/resources" "${CEF_TARGET_OUT_DIR}/files") + COPY_FILES("${CEF_TARGET}" "${CEFCLIENT_RESOURCES_SRCS}" "${CMAKE_CURRENT_SOURCE_DIR}" "${CEF_TARGET_OUT_DIR}/cefclient_files") # Set SUID permissions on the chrome-sandbox target. SET_LINUX_SUID_PERMISSIONS("${CEF_TARGET}" "${CEF_TARGET_OUT_DIR}/chrome-sandbox") @@ -237,7 +242,7 @@ if(OS_WINDOWS) add_executable(${CEF_TARGET} WIN32 ${CEFCLIENT_SRCS}) SET_EXECUTABLE_TARGET_PROPERTIES(${CEF_TARGET}) add_dependencies(${CEF_TARGET} libcef_dll_wrapper) - target_link_libraries(${CEF_TARGET} libcef_lib libcef_dll_wrapper ${CEF_STANDARD_LIBS} glu32.lib opengl32.lib) + target_link_libraries(${CEF_TARGET} libcef_lib libcef_dll_wrapper ${CEF_STANDARD_LIBS} glu32.lib imm32.lib opengl32.lib) if(USE_SANDBOX) # Logical target used to link the cef_sandbox library. diff --git a/tests/cefclient/browser/binding_test.cc b/tests/cefclient/browser/binding_test.cc index f16996cb..56301774 100644 --- a/tests/cefclient/browser/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/browser/binding_test.h" +#include "tests/cefclient/browser/binding_test.h" #include #include diff --git a/tests/cefclient/browser/binding_test.h b/tests/cefclient/browser/binding_test.h index 645eafe6..96926945 100644 --- a/tests/cefclient/browser/binding_test.h +++ b/tests/cefclient/browser/binding_test.h @@ -6,7 +6,7 @@ #define CEF_TESTS_CEFCLIENT_BROWSER_BINDING_TEST_H_ #pragma once -#include "cefclient/browser/test_runner.h" +#include "tests/cefclient/browser/test_runner.h" namespace client { namespace binding_test { diff --git a/tests/cefclient/browser/browser_window.cc b/tests/cefclient/browser/browser_window.cc index 5ed6a4f4..05dcd067 100644 --- a/tests/cefclient/browser/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/browser_window.h" +#include "tests/cefclient/browser/browser_window.h" #include "include/base/cef_bind.h" -#include "cefclient/browser/main_message_loop.h" +#include "tests/shared/browser/main_message_loop.h" namespace client { diff --git a/tests/cefclient/browser/browser_window.h b/tests/cefclient/browser/browser_window.h index 4d9fd8c7..65e6b677 100644 --- a/tests/cefclient/browser/browser_window.h +++ b/tests/cefclient/browser/browser_window.h @@ -8,8 +8,8 @@ #include "include/base/cef_scoped_ptr.h" #include "include/cef_browser.h" -#include "cefclient/browser/client_handler.h" -#include "cefclient/browser/client_types.h" +#include "tests/cefclient/browser/client_handler.h" +#include "tests/cefclient/browser/client_types.h" namespace client { diff --git a/tests/cefclient/browser/browser_window_osr_gtk.cc b/tests/cefclient/browser/browser_window_osr_gtk.cc index 40f5f325..5508c8bc 100644 --- a/tests/cefclient/browser/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/browser_window_osr_gtk.h" +#include "tests/cefclient/browser/browser_window_osr_gtk.h" #include #include @@ -19,8 +19,8 @@ #include "include/base/cef_logging.h" #include "include/wrapper/cef_closure_task.h" -#include "cefclient/browser/geometry_util.h" -#include "cefclient/browser/main_message_loop.h" +#include "tests/shared/browser/geometry_util.h" +#include "tests/shared/browser/main_message_loop.h" namespace client { diff --git a/tests/cefclient/browser/browser_window_osr_gtk.h b/tests/cefclient/browser/browser_window_osr_gtk.h index 62e3773c..60e43b6a 100644 --- a/tests/cefclient/browser/browser_window_osr_gtk.h +++ b/tests/cefclient/browser/browser_window_osr_gtk.h @@ -6,9 +6,9 @@ #define CEF_TESTS_CEFCLIENT_BROWSER_BROWSER_WINDOW_OSR_GTK_H_ #pragma once -#include "cefclient/browser/browser_window.h" -#include "cefclient/browser/client_handler_osr.h" -#include "cefclient/browser/osr_renderer.h" +#include "tests/cefclient/browser/browser_window.h" +#include "tests/cefclient/browser/client_handler_osr.h" +#include "tests/cefclient/browser/osr_renderer.h" namespace client { diff --git a/tests/cefclient/browser/browser_window_osr_mac.h b/tests/cefclient/browser/browser_window_osr_mac.h index 70814136..b50681d0 100644 --- a/tests/cefclient/browser/browser_window_osr_mac.h +++ b/tests/cefclient/browser/browser_window_osr_mac.h @@ -6,10 +6,10 @@ #define CEF_TESTS_CEFCLIENT_BROWSER_BROWSER_WINDOW_OSR_MAC_H_ #pragma once -#include "cefclient/browser/browser_window.h" -#include "cefclient/browser/client_handler_osr.h" -#include "cefclient/browser/osr_renderer.h" -#include "cefclient/browser/text_input_client_osr_mac.h" +#include "tests/cefclient/browser/browser_window.h" +#include "tests/cefclient/browser/client_handler_osr.h" +#include "tests/cefclient/browser/osr_renderer.h" +#include "tests/cefclient/browser/text_input_client_osr_mac.h" namespace client { diff --git a/tests/cefclient/browser/browser_window_osr_mac.mm b/tests/cefclient/browser/browser_window_osr_mac.mm index 694d9a07..302fb502 100644 --- a/tests/cefclient/browser/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/browser_window_osr_mac.h" +#include "tests/cefclient/browser/browser_window_osr_mac.h" #include #import @@ -11,10 +11,10 @@ #include "include/base/cef_logging.h" #include "include/cef_parser.h" #include "include/wrapper/cef_closure_task.h" -#include "cefclient/browser/bytes_write_handler.h" -#include "cefclient/browser/geometry_util.h" -#include "cefclient/browser/main_message_loop.h" -#include "cefclient/browser/text_input_client_osr_mac.h" +#include "tests/cefclient/browser/bytes_write_handler.h" +#include "tests/cefclient/browser/text_input_client_osr_mac.h" +#include "tests/shared/browser/geometry_util.h" +#include "tests/shared/browser/main_message_loop.h" namespace { diff --git a/tests/cefclient/browser/browser_window_osr_win.cc b/tests/cefclient/browser/browser_window_osr_win.cc index 019a2762..a950e0d5 100644 --- a/tests/cefclient/browser/browser_window_osr_win.cc +++ b/tests/cefclient/browser/browser_window_osr_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/browser_window_osr_win.h" +#include "tests/cefclient/browser/browser_window_osr_win.h" -#include "cefclient/browser/main_message_loop.h" -#include "cefclient/browser/util_win.h" +#include "tests/shared/browser/main_message_loop.h" +#include "tests/shared/browser/util_win.h" namespace client { diff --git a/tests/cefclient/browser/browser_window_osr_win.h b/tests/cefclient/browser/browser_window_osr_win.h index 7d561ade..54f38699 100644 --- a/tests/cefclient/browser/browser_window_osr_win.h +++ b/tests/cefclient/browser/browser_window_osr_win.h @@ -6,8 +6,8 @@ #define CEF_TESTS_CEFCLIENT_BROWSER_BROWSER_WINDOW_OSR_WIN_H_ #pragma once -#include "cefclient/browser/browser_window.h" -#include "cefclient/browser/osr_window_win.h" +#include "tests/cefclient/browser/browser_window.h" +#include "tests/cefclient/browser/osr_window_win.h" namespace client { diff --git a/tests/cefclient/browser/browser_window_std_gtk.cc b/tests/cefclient/browser/browser_window_std_gtk.cc index f7cbca1c..251b9c7b 100644 --- a/tests/cefclient/browser/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/browser_window_std_gtk.h" +#include "tests/cefclient/browser/browser_window_std_gtk.h" #include #include @@ -13,8 +13,8 @@ #undef RootWindow // Definition conflicts with root_window.h #include "include/base/cef_logging.h" -#include "cefclient/browser/client_handler_std.h" -#include "cefclient/browser/main_message_loop.h" +#include "tests/cefclient/browser/client_handler_std.h" +#include "tests/shared/browser/main_message_loop.h" namespace client { diff --git a/tests/cefclient/browser/browser_window_std_gtk.h b/tests/cefclient/browser/browser_window_std_gtk.h index 3b229472..434385d8 100644 --- a/tests/cefclient/browser/browser_window_std_gtk.h +++ b/tests/cefclient/browser/browser_window_std_gtk.h @@ -6,7 +6,7 @@ #define CEF_TESTS_CEFCLIENT_BROWSER_BROWSER_WINDOW_STD_GTK_H_ #pragma once -#include "cefclient/browser/browser_window.h" +#include "tests/cefclient/browser/browser_window.h" namespace client { diff --git a/tests/cefclient/browser/browser_window_std_mac.h b/tests/cefclient/browser/browser_window_std_mac.h index 03207794..225c3c5e 100644 --- a/tests/cefclient/browser/browser_window_std_mac.h +++ b/tests/cefclient/browser/browser_window_std_mac.h @@ -6,7 +6,7 @@ #define CEF_TESTS_CEFCLIENT_BROWSER_BROWSER_WINDOW_STD_MAC_H_ #pragma once -#include "cefclient/browser/browser_window.h" +#include "tests/cefclient/browser/browser_window.h" namespace client { diff --git a/tests/cefclient/browser/browser_window_std_mac.mm b/tests/cefclient/browser/browser_window_std_mac.mm index f1d3a44c..c56c2913 100644 --- a/tests/cefclient/browser/browser_window_std_mac.mm +++ b/tests/cefclient/browser/browser_window_std_mac.mm @@ -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/browser/browser_window_std_mac.h" +#include "tests/cefclient/browser/browser_window_std_mac.h" #include #include "include/base/cef_logging.h" -#include "cefclient/browser/client_handler_std.h" -#include "cefclient/browser/main_message_loop.h" +#include "tests/cefclient/browser/client_handler_std.h" +#include "tests/shared/browser/main_message_loop.h" namespace client { diff --git a/tests/cefclient/browser/browser_window_std_win.cc b/tests/cefclient/browser/browser_window_std_win.cc index cbb131a3..19d9c1fa 100644 --- a/tests/cefclient/browser/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/browser_window_std_win.h" +#include "tests/cefclient/browser/browser_window_std_win.h" -#include "cefclient/browser/client_handler_std.h" -#include "cefclient/browser/main_message_loop.h" +#include "tests/cefclient/browser/client_handler_std.h" +#include "tests/shared/browser/main_message_loop.h" namespace client { diff --git a/tests/cefclient/browser/browser_window_std_win.h b/tests/cefclient/browser/browser_window_std_win.h index e2a80b51..8bea1957 100644 --- a/tests/cefclient/browser/browser_window_std_win.h +++ b/tests/cefclient/browser/browser_window_std_win.h @@ -6,7 +6,7 @@ #define CEF_TESTS_CEFCLIENT_BROWSER_BROWSER_WINDOW_STD_WIN_H_ #pragma once -#include "cefclient/browser/browser_window.h" +#include "tests/cefclient/browser/browser_window.h" namespace client { diff --git a/tests/cefclient/browser/bytes_write_handler.cc b/tests/cefclient/browser/bytes_write_handler.cc index f1c0f37f..77b60695 100644 --- a/tests/cefclient/browser/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/browser/bytes_write_handler.h" +#include "tests/cefclient/browser/bytes_write_handler.h" #include #include diff --git a/tests/cefclient/browser/client_app_delegates_browser.cc b/tests/cefclient/browser/client_app_delegates_browser.cc index 579848e5..6429c41b 100644 --- a/tests/cefclient/browser/client_app_delegates_browser.cc +++ b/tests/cefclient/browser/client_app_delegates_browser.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/client_app_browser.h" +#include "tests/shared/browser/client_app_browser.h" #if defined(OS_LINUX) -#include "cefclient/browser/print_handler_gtk.h" +#include "tests/cefclient/browser/print_handler_gtk.h" #endif namespace client { diff --git a/tests/cefclient/browser/client_handler.cc b/tests/cefclient/browser/client_handler.cc index d9b196b7..4c32d6b3 100644 --- a/tests/cefclient/browser/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/browser/client_handler.h" +#include "tests/cefclient/browser/client_handler.h" #include #include @@ -17,11 +17,11 @@ #include "include/cef_ssl_status.h" #include "include/cef_x509_certificate.h" #include "include/wrapper/cef_closure_task.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" +#include "tests/cefclient/browser/main_context.h" +#include "tests/cefclient/browser/root_window_manager.h" +#include "tests/cefclient/browser/test_runner.h" +#include "tests/shared/browser/resource_util.h" +#include "tests/shared/common/client_switches.h" namespace client { diff --git a/tests/cefclient/browser/client_handler.h b/tests/cefclient/browser/client_handler.h index a5b2e6ea..3745ff55 100644 --- a/tests/cefclient/browser/client_handler.h +++ b/tests/cefclient/browser/client_handler.h @@ -13,10 +13,10 @@ #include "include/wrapper/cef_helpers.h" #include "include/wrapper/cef_message_router.h" #include "include/wrapper/cef_resource_manager.h" -#include "cefclient/browser/client_types.h" +#include "tests/cefclient/browser/client_types.h" #if defined(OS_LINUX) -#include "cefclient/browser/dialog_handler_gtk.h" +#include "tests/cefclient/browser/dialog_handler_gtk.h" #endif namespace client { diff --git a/tests/cefclient/browser/client_handler_osr.cc b/tests/cefclient/browser/client_handler_osr.cc index b7896580..e3bc12de 100644 --- a/tests/cefclient/browser/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/browser/client_handler_osr.h" +#include "tests/cefclient/browser/client_handler_osr.h" #include "include/base/cef_bind.h" #include "include/wrapper/cef_closure_task.h" diff --git a/tests/cefclient/browser/client_handler_osr.h b/tests/cefclient/browser/client_handler_osr.h index 0f73a32b..f1af487d 100644 --- a/tests/cefclient/browser/client_handler_osr.h +++ b/tests/cefclient/browser/client_handler_osr.h @@ -6,7 +6,7 @@ #define CEF_TESTS_CEFCLIENT_BROWSER_CLIENT_HANDLER_OSR_H_ #pragma once -#include "cefclient/browser/client_handler.h" +#include "tests/cefclient/browser/client_handler.h" namespace client { diff --git a/tests/cefclient/browser/client_handler_std.cc b/tests/cefclient/browser/client_handler_std.cc index d3625aaa..00fab5ee 100644 --- a/tests/cefclient/browser/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/browser/client_handler_std.h" +#include "tests/cefclient/browser/client_handler_std.h" namespace client { diff --git a/tests/cefclient/browser/client_handler_std.h b/tests/cefclient/browser/client_handler_std.h index 55258c77..94eed857 100644 --- a/tests/cefclient/browser/client_handler_std.h +++ b/tests/cefclient/browser/client_handler_std.h @@ -6,7 +6,7 @@ #define CEF_TESTS_CEFCLIENT_BROWSER_CLIENT_HANDLER_STD_H_ #pragma once -#include "cefclient/browser/client_handler.h" +#include "tests/cefclient/browser/client_handler.h" namespace client { diff --git a/tests/cefclient/browser/dialog_handler_gtk.cc b/tests/cefclient/browser/dialog_handler_gtk.cc index 54145f18..df66bb05 100644 --- a/tests/cefclient/browser/dialog_handler_gtk.cc +++ b/tests/cefclient/browser/dialog_handler_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/dialog_handler_gtk.h" +#include "tests/cefclient/browser/dialog_handler_gtk.h" #include #include @@ -10,7 +10,7 @@ #include "include/cef_browser.h" #include "include/cef_parser.h" #include "include/wrapper/cef_helpers.h" -#include "cefclient/browser/root_window.h" +#include "tests/cefclient/browser/root_window.h" namespace client { diff --git a/tests/cefclient/browser/dialog_test.cc b/tests/cefclient/browser/dialog_test.cc index b1937199..25360f71 100644 --- a/tests/cefclient/browser/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/browser/dialog_test.h" +#include "tests/cefclient/browser/dialog_test.h" #include diff --git a/tests/cefclient/browser/dialog_test.h b/tests/cefclient/browser/dialog_test.h index e8a7e19a..2044594f 100644 --- a/tests/cefclient/browser/dialog_test.h +++ b/tests/cefclient/browser/dialog_test.h @@ -6,7 +6,7 @@ #define CEF_TESTS_CEFCLIENT_BROWSER_DIALOG_TEST_H_ #pragma once -#include "cefclient/browser/test_runner.h" +#include "tests/cefclient/browser/test_runner.h" namespace client { namespace dialog_test { diff --git a/tests/cefclient/browser/drm_test.cc b/tests/cefclient/browser/drm_test.cc index 7177ff20..795432c9 100644 --- a/tests/cefclient/browser/drm_test.cc +++ b/tests/cefclient/browser/drm_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/browser/drm_test.h" +#include "tests/cefclient/browser/drm_test.h" #include #include diff --git a/tests/cefclient/browser/drm_test.h b/tests/cefclient/browser/drm_test.h index c243e78e..e8afa3f0 100644 --- a/tests/cefclient/browser/drm_test.h +++ b/tests/cefclient/browser/drm_test.h @@ -6,7 +6,7 @@ #define CEF_TESTS_CEFCLIENT_BROWSER_DRM_TEST_H_ #pragma once -#include "cefclient/browser/test_runner.h" +#include "tests/cefclient/browser/test_runner.h" namespace client { namespace drm_test { diff --git a/tests/cefclient/browser/main_context.cc b/tests/cefclient/browser/main_context.cc index a06a6cd2..3a38f20f 100644 --- a/tests/cefclient/browser/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/browser/main_context.h" +#include "tests/cefclient/browser/main_context.h" #include "include/base/cef_logging.h" diff --git a/tests/cefclient/browser/main_context.h b/tests/cefclient/browser/main_context.h index a8b60b45..b1db6b8f 100644 --- a/tests/cefclient/browser/main_context.h +++ b/tests/cefclient/browser/main_context.h @@ -10,7 +10,7 @@ #include "include/base/cef_ref_counted.h" #include "include/internal/cef_types_wrappers.h" -#include "cefclient/browser/osr_renderer.h" +#include "tests/cefclient/browser/osr_renderer.h" namespace client { diff --git a/tests/cefclient/browser/main_context_impl.cc b/tests/cefclient/browser/main_context_impl.cc index af341750..55b0349e 100644 --- a/tests/cefclient/browser/main_context_impl.cc +++ b/tests/cefclient/browser/main_context_impl.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/browser/main_context_impl.h" +#include "tests/cefclient/browser/main_context_impl.h" #include "include/cef_parser.h" #include "include/cef_web_plugin.h" -#include "cefclient/common/client_switches.h" +#include "tests/shared/common/client_switches.h" namespace client { diff --git a/tests/cefclient/browser/main_context_impl.h b/tests/cefclient/browser/main_context_impl.h index 36427c7c..f9ff6b08 100644 --- a/tests/cefclient/browser/main_context_impl.h +++ b/tests/cefclient/browser/main_context_impl.h @@ -10,8 +10,8 @@ #include "include/base/cef_thread_checker.h" #include "include/cef_app.h" #include "include/cef_command_line.h" -#include "cefclient/browser/main_context.h" -#include "cefclient/browser/root_window_manager.h" +#include "tests/cefclient/browser/main_context.h" +#include "tests/cefclient/browser/root_window_manager.h" namespace client { diff --git a/tests/cefclient/browser/main_context_impl_posix.cc b/tests/cefclient/browser/main_context_impl_posix.cc index 52f509a6..45ba6d8d 100644 --- a/tests/cefclient/browser/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/browser/main_context_impl.h" +#include "tests/cefclient/browser/main_context_impl.h" #include diff --git a/tests/cefclient/browser/main_context_impl_win.cc b/tests/cefclient/browser/main_context_impl_win.cc index b603bc5e..bf041764 100644 --- a/tests/cefclient/browser/main_context_impl_win.cc +++ b/tests/cefclient/browser/main_context_impl_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/browser/main_context_impl.h" +#include "tests/cefclient/browser/main_context_impl.h" #include #include diff --git a/tests/cefclient/browser/main_message_loop_multithreaded_win.cc b/tests/cefclient/browser/main_message_loop_multithreaded_win.cc index eb29d894..887ed836 100644 --- a/tests/cefclient/browser/main_message_loop_multithreaded_win.cc +++ b/tests/cefclient/browser/main_message_loop_multithreaded_win.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/browser/main_message_loop_multithreaded_win.h" +#include "tests/cefclient/browser/main_message_loop_multithreaded_win.h" #include "include/base/cef_bind.h" #include "include/base/cef_logging.h" #include "include/cef_app.h" -#include "cefclient/browser/resource.h" -#include "cefclient/browser/util_win.h" +#include "tests/cefclient/browser/resource.h" +#include "tests/shared/browser/util_win.h" namespace client { diff --git a/tests/cefclient/browser/main_message_loop_multithreaded_win.h b/tests/cefclient/browser/main_message_loop_multithreaded_win.h index 0e8ab3d9..5e6e32dd 100644 --- a/tests/cefclient/browser/main_message_loop_multithreaded_win.h +++ b/tests/cefclient/browser/main_message_loop_multithreaded_win.h @@ -11,7 +11,7 @@ #include "include/base/cef_lock.h" #include "include/base/cef_platform_thread.h" -#include "cefclient/browser/main_message_loop.h" +#include "tests/shared/browser/main_message_loop.h" namespace client { diff --git a/tests/cefclient/browser/osr_dragdrop_events.h b/tests/cefclient/browser/osr_dragdrop_events.h index 854e756c..db31e6bc 100644 --- a/tests/cefclient/browser/osr_dragdrop_events.h +++ b/tests/cefclient/browser/osr_dragdrop_events.h @@ -7,7 +7,7 @@ #pragma once #include "include/cef_render_handler.h" -#include "cefclient/browser/client_handler.h" +#include "tests/cefclient/browser/client_handler.h" namespace client { diff --git a/tests/cefclient/browser/osr_dragdrop_win.cc b/tests/cefclient/browser/osr_dragdrop_win.cc index 4a187858..e374df48 100644 --- a/tests/cefclient/browser/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/browser/osr_dragdrop_win.h" +#include "tests/cefclient/browser/osr_dragdrop_win.h" #if defined(CEF_USE_ATL) @@ -14,9 +14,9 @@ #include #include "include/wrapper/cef_helpers.h" -#include "cefclient/browser/bytes_write_handler.h" -#include "cefclient/browser/resource.h" -#include "cefclient/browser/util_win.h" +#include "tests/cefclient/browser/bytes_write_handler.h" +#include "tests/cefclient/browser/resource.h" +#include "tests/shared/browser/util_win.h" namespace client { diff --git a/tests/cefclient/browser/osr_dragdrop_win.h b/tests/cefclient/browser/osr_dragdrop_win.h index c1cb6bd0..535eeb8a 100644 --- a/tests/cefclient/browser/osr_dragdrop_win.h +++ b/tests/cefclient/browser/osr_dragdrop_win.h @@ -18,7 +18,7 @@ #include #include -#include "cefclient/browser/osr_dragdrop_events.h" +#include "tests/cefclient/browser/osr_dragdrop_events.h" namespace client { diff --git a/tests/cefclient/browser/osr_ime_handler_win.cc b/tests/cefclient/browser/osr_ime_handler_win.cc index 8624e30b..d6e83f95 100644 --- a/tests/cefclient/browser/osr_ime_handler_win.cc +++ b/tests/cefclient/browser/osr_ime_handler_win.cc @@ -8,11 +8,11 @@ #include #include "include/base/cef_build.h" -#include "cefclient/browser/geometry_util.h" -#include "cefclient/browser/main_message_loop.h" -#include "cefclient/browser/resource.h" -#include "cefclient/browser/util_win.h" -#include "cefclient/browser/osr_ime_handler_win.h" +#include "tests/cefclient/browser/resource.h" +#include "tests/cefclient/browser/osr_ime_handler_win.h" +#include "tests/shared/browser/geometry_util.h" +#include "tests/shared/browser/main_message_loop.h" +#include "tests/shared/browser/util_win.h" #define ColorUNDERLINE 0xFF000000 // Black SkColor value for underline, // same as Blink. diff --git a/tests/cefclient/browser/osr_renderer.cc b/tests/cefclient/browser/osr_renderer.cc index c8c0ad10..06f452c8 100644 --- a/tests/cefclient/browser/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/browser/osr_renderer.h" +#include "tests/cefclient/browser/osr_renderer.h" #if defined(OS_WIN) #include diff --git a/tests/cefclient/browser/osr_window_win.cc b/tests/cefclient/browser/osr_window_win.cc index fdab749c..e066bbcd 100644 --- a/tests/cefclient/browser/osr_window_win.cc +++ b/tests/cefclient/browser/osr_window_win.cc @@ -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/browser/osr_window_win.h" +#include "tests/cefclient/browser/osr_window_win.h" #include #include "include/base/cef_build.h" -#include "cefclient/browser/geometry_util.h" -#include "cefclient/browser/main_message_loop.h" -#include "cefclient/browser/resource.h" -#include "cefclient/browser/util_win.h" -#include "cefclient/browser/osr_ime_handler_win.h" +#include "tests/shared/browser/geometry_util.h" +#include "tests/shared/browser/main_message_loop.h" +#include "tests/cefclient/browser/resource.h" +#include "tests/cefclient/browser/osr_ime_handler_win.h" +#include "tests/shared/browser/util_win.h" namespace client { diff --git a/tests/cefclient/browser/osr_window_win.h b/tests/cefclient/browser/osr_window_win.h index b93c96ba..78dc2e4a 100644 --- a/tests/cefclient/browser/osr_window_win.h +++ b/tests/cefclient/browser/osr_window_win.h @@ -10,9 +10,9 @@ #include "include/base/cef_ref_counted.h" #include "include/wrapper/cef_closure_task.h" #include "include/wrapper/cef_helpers.h" -#include "cefclient/browser/client_handler_osr.h" -#include "cefclient/browser/osr_dragdrop_win.h" -#include "cefclient/browser/osr_renderer.h" +#include "tests/cefclient/browser/client_handler_osr.h" +#include "tests/cefclient/browser/osr_dragdrop_win.h" +#include "tests/cefclient/browser/osr_renderer.h" namespace client { diff --git a/tests/cefclient/browser/preferences_test.cc b/tests/cefclient/browser/preferences_test.cc index 7cf9c928..3a1a205a 100644 --- a/tests/cefclient/browser/preferences_test.cc +++ b/tests/cefclient/browser/preferences_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/browser/preferences_test.h" +#include "tests/cefclient/browser/preferences_test.h" #include #include diff --git a/tests/cefclient/browser/preferences_test.h b/tests/cefclient/browser/preferences_test.h index 7f8ba040..b11d89d2 100644 --- a/tests/cefclient/browser/preferences_test.h +++ b/tests/cefclient/browser/preferences_test.h @@ -6,7 +6,7 @@ #define CEF_TESTS_CEFCLIENT_BROWSER_PREFERENCES_TEST_H_ #pragma once -#include "cefclient/browser/test_runner.h" +#include "tests/cefclient/browser/test_runner.h" namespace client { namespace preferences_test { diff --git a/tests/cefclient/browser/print_handler_gtk.cc b/tests/cefclient/browser/print_handler_gtk.cc index c23d9c59..eb3a529c 100644 --- a/tests/cefclient/browser/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/browser/print_handler_gtk.h" +#include "tests/cefclient/browser/print_handler_gtk.h" #include diff --git a/tests/cefclient/browser/resource.h b/tests/cefclient/browser/resource.h index 4cf8f657..6990bec5 100644 --- a/tests/cefclient/browser/resource.h +++ b/tests/cefclient/browser/resource.h @@ -16,7 +16,6 @@ #define IDI_CEFCLIENT 107 #define IDI_SMALL 108 #define IDC_CEFCLIENT 109 -#define IDS_OSR_WIDGET_CLASS 110 #define IDR_MAINFRAME 128 #define IDC_NAV_BACK 200 #define IDC_NAV_FORWARD 201 diff --git a/tests/cefclient/browser/resource_util_linux.cc b/tests/cefclient/browser/resource_util_linux.cc index 04dd14de..939cc670 100644 --- a/tests/cefclient/browser/resource_util_linux.cc +++ b/tests/cefclient/browser/resource_util_linux.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/browser/resource_util.h" +#include "tests/shared/browser/resource_util.h" #include #include @@ -26,10 +26,11 @@ bool GetResourceDir(std::string& dir) { if (!pos) return false; - // Add "files" to the path. - strcpy(pos+1, "files"); // NOLINT(runtime/printf) + // Add "cefclient_files" to the path. + strcpy(pos+1, "cefclient_files"); // NOLINT(runtime/printf) dir = std::string(buff); return true; } } // namespace client + diff --git a/tests/cefclient/browser/resource_util_win_idmap.cc b/tests/cefclient/browser/resource_util_win_idmap.cc new file mode 100644 index 00000000..cd08ec6b --- /dev/null +++ b/tests/cefclient/browser/resource_util_win_idmap.cc @@ -0,0 +1,49 @@ +// Copyright (c) 2013 The Chromium Embedded Framework Authors. All rights +// reserved. Use of this source code is governed by a BSD-style license that +// can be found in the LICENSE file. + +#include + +#include "tests/cefclient/browser/resource.h" + +namespace client { + +int GetResourceId(const char* resource_name) { + // Map of resource labels to BINARY id values. + static struct _resource_map { + char* name; + int id; + } resource_map[] = { + {"binding.html", IDS_BINDING_HTML}, + {"dialogs.html", IDS_DIALOGS_HTML}, + {"draggable.html", IDS_DRAGGABLE_HTML}, + {"drm.html", IDS_DRM_HTML}, + {"logo.png", IDS_LOGO_PNG}, + {"localstorage.html", IDS_LOCALSTORAGE_HTML}, + {"menu_icon.1x.png", IDS_MENU_ICON_1X_PNG}, + {"menu_icon.2x.png", IDS_MENU_ICON_2X_PNG}, + {"osr_test.html", IDS_OSRTEST_HTML}, + {"other_tests.html", IDS_OTHER_TESTS_HTML}, + {"pdf.html", IDS_PDF_HTML}, + {"pdf.pdf", IDS_PDF_PDF}, + {"performance.html", IDS_PERFORMANCE_HTML}, + {"performance2.html", IDS_PERFORMANCE2_HTML}, + {"preferences.html", IDS_PREFERENCES_HTML}, + {"response_filter.html", IDS_RESPONSE_FILTER_HTML}, + {"transparency.html", IDS_TRANSPARENCY_HTML}, + {"urlrequest.html", IDS_URLREQUEST_HTML}, + {"window.html", IDS_WINDOW_HTML}, + {"window_icon.1x.png", IDS_WINDOW_ICON_1X_PNG}, + {"window_icon.2x.png", IDS_WINDOW_ICON_2X_PNG}, + {"xmlhttprequest.html", IDS_XMLHTTPREQUEST_HTML}, + }; + + for (int i = 0; i < sizeof(resource_map)/sizeof(_resource_map); ++i) { + if (!strcmp(resource_map[i].name, resource_name)) + return resource_map[i].id; + } + + return 0; +} + +} // namespace client diff --git a/tests/cefclient/browser/response_filter_test.cc b/tests/cefclient/browser/response_filter_test.cc index fea868b9..3dfc8a66 100644 --- a/tests/cefclient/browser/response_filter_test.cc +++ b/tests/cefclient/browser/response_filter_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/browser/response_filter_test.h" +#include "tests/cefclient/browser/response_filter_test.h" #include #include @@ -10,7 +10,7 @@ #include "include/base/cef_logging.h" #include "include/cef_command_line.h" -#include "cefclient/common/client_switches.h" +#include "tests/shared/common/client_switches.h" namespace client { namespace response_filter_test { diff --git a/tests/cefclient/browser/root_window.cc b/tests/cefclient/browser/root_window.cc index ca87538b..9fdeb8d7 100644 --- a/tests/cefclient/browser/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/browser/root_window.h" +#include "tests/cefclient/browser/root_window.h" -#include "cefclient/browser/main_context.h" -#include "cefclient/browser/root_window_manager.h" +#include "tests/cefclient/browser/main_context.h" +#include "tests/cefclient/browser/root_window_manager.h" namespace client { diff --git a/tests/cefclient/browser/root_window.h b/tests/cefclient/browser/root_window.h index 52631602..fee654c5 100644 --- a/tests/cefclient/browser/root_window.h +++ b/tests/cefclient/browser/root_window.h @@ -10,8 +10,8 @@ #include "include/base/cef_ref_counted.h" #include "include/cef_browser.h" -#include "cefclient/browser/client_types.h" -#include "cefclient/browser/main_message_loop.h" +#include "tests/cefclient/browser/client_types.h" +#include "tests/shared/browser/main_message_loop.h" namespace client { diff --git a/tests/cefclient/browser/root_window_create.cc b/tests/cefclient/browser/root_window_create.cc index 84f3efd6..884fb4b4 100644 --- a/tests/cefclient/browser/root_window_create.cc +++ b/tests/cefclient/browser/root_window_create.cc @@ -2,18 +2,18 @@ // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. -#include "cefclient/browser/root_window.h" +#include "tests/cefclient/browser/root_window.h" #if defined(OS_WIN) || defined(OS_LINUX) -#include "cefclient/browser/root_window_views.h" +#include "tests/cefclient/browser/root_window_views.h" #endif #if defined(OS_WIN) -#include "cefclient/browser/root_window_win.h" +#include "tests/cefclient/browser/root_window_win.h" #elif defined(OS_LINUX) -#include "cefclient/browser/root_window_gtk.h" +#include "tests/cefclient/browser/root_window_gtk.h" #elif defined(OS_MACOSX) -#include "cefclient/browser/root_window_mac.h" +#include "tests/cefclient/browser/root_window_mac.h" #endif namespace client { diff --git a/tests/cefclient/browser/root_window_gtk.cc b/tests/cefclient/browser/root_window_gtk.cc index 0316fb54..276854d5 100644 --- a/tests/cefclient/browser/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/browser/root_window_gtk.h" +#include "tests/cefclient/browser/root_window_gtk.h" #include #include @@ -13,14 +13,14 @@ #include "include/base/cef_bind.h" #include "include/cef_app.h" -#include "cefclient/browser/browser_window_osr_gtk.h" -#include "cefclient/browser/browser_window_std_gtk.h" -#include "cefclient/browser/main_context.h" -#include "cefclient/browser/main_message_loop.h" -#include "cefclient/browser/resource.h" -#include "cefclient/browser/temp_window.h" -#include "cefclient/browser/window_test_runner_gtk.h" -#include "cefclient/common/client_switches.h" +#include "tests/cefclient/browser/browser_window_osr_gtk.h" +#include "tests/cefclient/browser/browser_window_std_gtk.h" +#include "tests/cefclient/browser/main_context.h" +#include "tests/cefclient/browser/resource.h" +#include "tests/cefclient/browser/temp_window.h" +#include "tests/cefclient/browser/window_test_runner_gtk.h" +#include "tests/shared/browser/main_message_loop.h" +#include "tests/shared/common/client_switches.h" namespace client { diff --git a/tests/cefclient/browser/root_window_gtk.h b/tests/cefclient/browser/root_window_gtk.h index f446c366..fc34a54f 100644 --- a/tests/cefclient/browser/root_window_gtk.h +++ b/tests/cefclient/browser/root_window_gtk.h @@ -10,8 +10,8 @@ #include #include "include/base/cef_scoped_ptr.h" -#include "cefclient/browser/browser_window.h" -#include "cefclient/browser/root_window.h" +#include "tests/cefclient/browser/browser_window.h" +#include "tests/cefclient/browser/root_window.h" namespace client { diff --git a/tests/cefclient/browser/root_window_mac.h b/tests/cefclient/browser/root_window_mac.h index 1a2d307e..d4b1bf1e 100644 --- a/tests/cefclient/browser/root_window_mac.h +++ b/tests/cefclient/browser/root_window_mac.h @@ -9,8 +9,8 @@ #include #include "include/base/cef_scoped_ptr.h" -#include "cefclient/browser/browser_window.h" -#include "cefclient/browser/root_window.h" +#include "tests/cefclient/browser/browser_window.h" +#include "tests/cefclient/browser/root_window.h" #ifdef __OBJC__ @class NSWindow; diff --git a/tests/cefclient/browser/root_window_mac.mm b/tests/cefclient/browser/root_window_mac.mm index 74fe7093..ca0434c5 100644 --- a/tests/cefclient/browser/root_window_mac.mm +++ b/tests/cefclient/browser/root_window_mac.mm @@ -2,20 +2,20 @@ // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. -#include "cefclient/browser/root_window_mac.h" +#include "tests/cefclient/browser/root_window_mac.h" #include #include "include/base/cef_bind.h" #include "include/cef_app.h" #include "include/cef_application_mac.h" -#include "cefclient/browser/browser_window_osr_mac.h" -#include "cefclient/browser/browser_window_std_mac.h" -#include "cefclient/browser/main_context.h" -#include "cefclient/browser/main_message_loop.h" -#include "cefclient/browser/temp_window.h" -#include "cefclient/browser/window_test_runner_mac.h" -#include "cefclient/common/client_switches.h" +#include "tests/cefclient/browser/browser_window_osr_mac.h" +#include "tests/cefclient/browser/browser_window_std_mac.h" +#include "tests/cefclient/browser/main_context.h" +#include "tests/cefclient/browser/temp_window.h" +#include "tests/cefclient/browser/window_test_runner_mac.h" +#include "tests/shared/browser/main_message_loop.h" +#include "tests/shared/common/client_switches.h" // Receives notifications from controls and the browser window. Will delete // itself when done. diff --git a/tests/cefclient/browser/root_window_manager.cc b/tests/cefclient/browser/root_window_manager.cc index 3e2bc019..84c494f4 100644 --- a/tests/cefclient/browser/root_window_manager.cc +++ b/tests/cefclient/browser/root_window_manager.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/browser/root_window_manager.h" +#include "tests/cefclient/browser/root_window_manager.h" #include #include "include/base/cef_bind.h" #include "include/base/cef_logging.h" #include "include/wrapper/cef_helpers.h" -#include "cefclient/browser/main_context.h" -#include "cefclient/browser/resource_util.h" -#include "cefclient/browser/test_runner.h" -#include "cefclient/common/client_switches.h" +#include "tests/cefclient/browser/main_context.h" +#include "tests/cefclient/browser/test_runner.h" +#include "tests/shared/browser/resource_util.h" +#include "tests/shared/common/client_switches.h" namespace client { diff --git a/tests/cefclient/browser/root_window_manager.h b/tests/cefclient/browser/root_window_manager.h index cf626cda..9e7fd2c0 100644 --- a/tests/cefclient/browser/root_window_manager.h +++ b/tests/cefclient/browser/root_window_manager.h @@ -10,8 +10,8 @@ #include "include/base/cef_scoped_ptr.h" #include "include/cef_command_line.h" -#include "cefclient/browser/root_window.h" -#include "cefclient/browser/temp_window.h" +#include "tests/cefclient/browser/root_window.h" +#include "tests/cefclient/browser/temp_window.h" namespace client { diff --git a/tests/cefclient/browser/root_window_views.cc b/tests/cefclient/browser/root_window_views.cc index 262432fb..56b6c2a9 100644 --- a/tests/cefclient/browser/root_window_views.cc +++ b/tests/cefclient/browser/root_window_views.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/browser/root_window_views.h" +#include "tests/cefclient/browser/root_window_views.h" #include "include/base/cef_bind.h" #include "include/base/cef_build.h" #include "include/wrapper/cef_helpers.h" #include "include/cef_app.h" -#include "cefclient/browser/client_handler_std.h" +#include "tests/cefclient/browser/client_handler_std.h" namespace client { diff --git a/tests/cefclient/browser/root_window_views.h b/tests/cefclient/browser/root_window_views.h index 3f54eeab..0f07a428 100644 --- a/tests/cefclient/browser/root_window_views.h +++ b/tests/cefclient/browser/root_window_views.h @@ -9,9 +9,9 @@ #include #include "include/base/cef_scoped_ptr.h" -#include "cefclient/browser/client_handler.h" -#include "cefclient/browser/root_window.h" -#include "cefclient/browser/views_window.h" +#include "tests/cefclient/browser/client_handler.h" +#include "tests/cefclient/browser/root_window.h" +#include "tests/cefclient/browser/views_window.h" namespace client { diff --git a/tests/cefclient/browser/root_window_win.cc b/tests/cefclient/browser/root_window_win.cc index 44f14a0e..c743c65b 100644 --- a/tests/cefclient/browser/root_window_win.cc +++ b/tests/cefclient/browser/root_window_win.cc @@ -2,21 +2,21 @@ // reserved. Use of this source code is governed by a BSD-style license that // can be found in the LICENSE file. -#include "cefclient/browser/root_window_win.h" +#include "tests/cefclient/browser/root_window_win.h" #include "include/base/cef_bind.h" #include "include/base/cef_build.h" #include "include/cef_app.h" -#include "cefclient/browser/browser_window_osr_win.h" -#include "cefclient/browser/browser_window_std_win.h" -#include "cefclient/browser/geometry_util.h" -#include "cefclient/browser/main_context.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/browser/window_test_runner_win.h" -#include "cefclient/common/client_switches.h" +#include "tests/cefclient/browser/browser_window_osr_win.h" +#include "tests/cefclient/browser/browser_window_std_win.h" +#include "tests/cefclient/browser/main_context.h" +#include "tests/cefclient/browser/resource.h" +#include "tests/cefclient/browser/temp_window.h" +#include "tests/cefclient/browser/window_test_runner_win.h" +#include "tests/shared/browser/geometry_util.h" +#include "tests/shared/browser/main_message_loop.h" +#include "tests/shared/browser/util_win.h" +#include "tests/shared/common/client_switches.h" #define MAX_URL_LENGTH 255 #define BUTTON_WIDTH 72 diff --git a/tests/cefclient/browser/root_window_win.h b/tests/cefclient/browser/root_window_win.h index 833373c3..b99e5d92 100644 --- a/tests/cefclient/browser/root_window_win.h +++ b/tests/cefclient/browser/root_window_win.h @@ -12,8 +12,8 @@ #include #include "include/base/cef_scoped_ptr.h" -#include "cefclient/browser/browser_window.h" -#include "cefclient/browser/root_window.h" +#include "tests/cefclient/browser/browser_window.h" +#include "tests/cefclient/browser/root_window.h" namespace client { diff --git a/tests/cefclient/browser/scheme_test.cc b/tests/cefclient/browser/scheme_test.cc index 69d84962..0a078827 100644 --- a/tests/cefclient/browser/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/browser/scheme_test.h" +#include "tests/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/browser/resource_util.h" -#include "cefclient/browser/test_runner.h" +#include "tests/cefclient/browser/test_runner.h" +#include "tests/shared/browser/resource_util.h" namespace client { namespace scheme_test { diff --git a/tests/cefclient/browser/temp_window.h b/tests/cefclient/browser/temp_window.h index 1e9f038e..499c80af 100644 --- a/tests/cefclient/browser/temp_window.h +++ b/tests/cefclient/browser/temp_window.h @@ -6,14 +6,14 @@ #define CEF_TESTS_CEFCLIENT_BROWSER_TEMP_WINDOW_H_ #pragma once -#include "cefclient/browser/client_types.h" +#include "tests/cefclient/browser/client_types.h" #if defined(OS_WIN) -#include "cefclient/browser/temp_window_win.h" +#include "tests/cefclient/browser/temp_window_win.h" #elif defined(OS_LINUX) -#include "cefclient/browser/temp_window_x11.h" +#include "tests/cefclient/browser/temp_window_x11.h" #elif defined(OS_MACOSX) -#include "cefclient/browser/temp_window_mac.h" +#include "tests/cefclient/browser/temp_window_mac.h" #endif namespace client { diff --git a/tests/cefclient/browser/temp_window_mac.h b/tests/cefclient/browser/temp_window_mac.h index 552ca6b4..9c1301b4 100644 --- a/tests/cefclient/browser/temp_window_mac.h +++ b/tests/cefclient/browser/temp_window_mac.h @@ -6,7 +6,7 @@ #define CEF_TESTS_CEFCLIENT_BROWSER_TEMP_WINDOW_MAC_H_ #pragma once -#include "cefclient/browser/client_types.h" +#include "tests/cefclient/browser/client_types.h" namespace client { diff --git a/tests/cefclient/browser/temp_window_mac.mm b/tests/cefclient/browser/temp_window_mac.mm index 80524397..b65f92b7 100644 --- a/tests/cefclient/browser/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/browser/temp_window_mac.h" +#include "tests/cefclient/browser/temp_window_mac.h" #include diff --git a/tests/cefclient/browser/temp_window_win.cc b/tests/cefclient/browser/temp_window_win.cc index a2585d58..8d62dd4f 100644 --- a/tests/cefclient/browser/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/browser/temp_window_win.h" +#include "tests/cefclient/browser/temp_window_win.h" #include diff --git a/tests/cefclient/browser/temp_window_x11.cc b/tests/cefclient/browser/temp_window_x11.cc index e77fff58..5e8af83d 100644 --- a/tests/cefclient/browser/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/browser/temp_window_x11.h" +#include "tests/cefclient/browser/temp_window_x11.h" #include diff --git a/tests/cefclient/browser/test_runner.cc b/tests/cefclient/browser/test_runner.cc index b2b4a0e3..424e12e3 100644 --- a/tests/cefclient/browser/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/browser/test_runner.h" +#include "tests/cefclient/browser/test_runner.h" #include @@ -13,18 +13,18 @@ #include "include/cef_web_plugin.h" #include "include/wrapper/cef_closure_task.h" #include "include/wrapper/cef_stream_resource_handler.h" -#include "cefclient/browser/binding_test.h" -#include "cefclient/browser/dialog_test.h" -#include "cefclient/browser/drm_test.h" -#include "cefclient/browser/main_context.h" -#include "cefclient/browser/preferences_test.h" -#include "cefclient/browser/resource.h" -#include "cefclient/browser/resource_util.h" -#include "cefclient/browser/response_filter_test.h" -#include "cefclient/browser/root_window_manager.h" -#include "cefclient/browser/scheme_test.h" -#include "cefclient/browser/urlrequest_test.h" -#include "cefclient/browser/window_test.h" +#include "tests/cefclient/browser/binding_test.h" +#include "tests/cefclient/browser/dialog_test.h" +#include "tests/cefclient/browser/drm_test.h" +#include "tests/cefclient/browser/main_context.h" +#include "tests/cefclient/browser/preferences_test.h" +#include "tests/cefclient/browser/resource.h" +#include "tests/cefclient/browser/response_filter_test.h" +#include "tests/cefclient/browser/root_window_manager.h" +#include "tests/cefclient/browser/scheme_test.h" +#include "tests/cefclient/browser/urlrequest_test.h" +#include "tests/cefclient/browser/window_test.h" +#include "tests/shared/browser/resource_util.h" namespace client { namespace test_runner { diff --git a/tests/cefclient/browser/urlrequest_test.cc b/tests/cefclient/browser/urlrequest_test.cc index 115ed072..5410726e 100644 --- a/tests/cefclient/browser/urlrequest_test.cc +++ b/tests/cefclient/browser/urlrequest_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/browser/urlrequest_test.h" +#include "tests/cefclient/browser/urlrequest_test.h" #include diff --git a/tests/cefclient/browser/urlrequest_test.h b/tests/cefclient/browser/urlrequest_test.h index 4621085d..ec572e71 100644 --- a/tests/cefclient/browser/urlrequest_test.h +++ b/tests/cefclient/browser/urlrequest_test.h @@ -6,7 +6,7 @@ #define CEF_TESTS_CEFCLIENT_BROWSER_URLREQUEST_TEST_H_ #pragma once -#include "cefclient/browser/test_runner.h" +#include "tests/cefclient/browser/test_runner.h" namespace client { namespace urlrequest_test { diff --git a/tests/cefclient/browser/views_window.cc b/tests/cefclient/browser/views_window.cc index ff53fe27..45a6c73a 100644 --- a/tests/cefclient/browser/views_window.cc +++ b/tests/cefclient/browser/views_window.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/views_window.h" +#include "tests/cefclient/browser/views_window.h" #include @@ -11,10 +11,10 @@ #include "include/views/cef_box_layout.h" #include "include/wrapper/cef_helpers.h" #include "include/cef_app.h" -#include "cefclient/browser/main_context.h" -#include "cefclient/browser/resource.h" -#include "cefclient/browser/resource_util.h" -#include "cefclient/common/client_switches.h" +#include "tests/cefclient/browser/main_context.h" +#include "tests/cefclient/browser/resource.h" +#include "tests/shared/browser/resource_util.h" +#include "tests/shared/common/client_switches.h" #if !defined(OS_WIN) #define VK_RETURN 0x0D diff --git a/tests/cefclient/browser/window_test.cc b/tests/cefclient/browser/window_test.cc index bdac555e..76ff9803 100644 --- a/tests/cefclient/browser/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/browser/window_test.h" +#include "tests/cefclient/browser/window_test.h" #include #include @@ -11,19 +11,19 @@ #include "include/base/cef_bind.h" #include "include/wrapper/cef_stream_resource_handler.h" -#include "cefclient/browser/main_context.h" -#include "cefclient/browser/window_test_runner.h" +#include "tests/cefclient/browser/main_context.h" +#include "tests/cefclient/browser/window_test_runner.h" #if defined(OS_WIN) || defined(OS_LINUX) -#include "cefclient/browser/window_test_runner_views.h" +#include "tests/cefclient/browser/window_test_runner_views.h" #endif #if defined(OS_WIN) -#include "cefclient/browser/window_test_runner_win.h" +#include "tests/cefclient/browser/window_test_runner_win.h" #elif defined(OS_LINUX) -#include "cefclient/browser/window_test_runner_gtk.h" +#include "tests/cefclient/browser/window_test_runner_gtk.h" #elif defined(OS_MACOSX) -#include "cefclient/browser/window_test_runner_mac.h" +#include "tests/cefclient/browser/window_test_runner_mac.h" #endif namespace client { diff --git a/tests/cefclient/browser/window_test.h b/tests/cefclient/browser/window_test.h index 7f75ab82..2b99bbb8 100644 --- a/tests/cefclient/browser/window_test.h +++ b/tests/cefclient/browser/window_test.h @@ -6,7 +6,7 @@ #define CEF_TESTS_CEFCLIENT_BROWSER_WINDOW_TEST_H_ #pragma once -#include "cefclient/browser/test_runner.h" +#include "tests/cefclient/browser/test_runner.h" namespace client { namespace window_test { diff --git a/tests/cefclient/browser/window_test_runner.cc b/tests/cefclient/browser/window_test_runner.cc index e0df2317..05f1ac59 100644 --- a/tests/cefclient/browser/window_test_runner.cc +++ b/tests/cefclient/browser/window_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/browser/window_test_runner.h" +#include "tests/cefclient/browser/window_test_runner.h" namespace client { namespace window_test { diff --git a/tests/cefclient/browser/window_test_runner_gtk.cc b/tests/cefclient/browser/window_test_runner_gtk.cc index d3b7e6ae..edea69ac 100644 --- a/tests/cefclient/browser/window_test_runner_gtk.cc +++ b/tests/cefclient/browser/window_test_runner_gtk.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/browser/window_test_runner_gtk.h" +#include "tests/cefclient/browser/window_test_runner_gtk.h" #include #include "include/wrapper/cef_helpers.h" -#include "cefclient/browser/main_message_loop.h" -#include "cefclient/browser/root_window.h" +#include "tests/cefclient/browser/root_window.h" +#include "tests/shared/browser/main_message_loop.h" namespace client { namespace window_test { diff --git a/tests/cefclient/browser/window_test_runner_gtk.h b/tests/cefclient/browser/window_test_runner_gtk.h index 6871c56b..a225a45c 100644 --- a/tests/cefclient/browser/window_test_runner_gtk.h +++ b/tests/cefclient/browser/window_test_runner_gtk.h @@ -6,7 +6,7 @@ #define CEF_TESTS_CEFCLIENT_BROWSER_WINDOW_TEST_RUNNER_GTK_H_ #pragma once -#include "cefclient/browser/window_test_runner.h" +#include "tests/cefclient/browser/window_test_runner.h" namespace client { namespace window_test { diff --git a/tests/cefclient/browser/window_test_runner_mac.h b/tests/cefclient/browser/window_test_runner_mac.h index 5329a337..faf73d83 100644 --- a/tests/cefclient/browser/window_test_runner_mac.h +++ b/tests/cefclient/browser/window_test_runner_mac.h @@ -6,7 +6,7 @@ #define CEF_TESTS_CEFCLIENT_BROWSER_WINDOW_TEST_RUNNER_MAC_H_ #pragma once -#include "cefclient/browser/window_test_runner.h" +#include "tests/cefclient/browser/window_test_runner.h" namespace client { namespace window_test { diff --git a/tests/cefclient/browser/window_test_runner_mac.mm b/tests/cefclient/browser/window_test_runner_mac.mm index 1831b54e..61d95ae3 100644 --- a/tests/cefclient/browser/window_test_runner_mac.mm +++ b/tests/cefclient/browser/window_test_runner_mac.mm @@ -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/browser/window_test_runner_mac.h" +#include "tests/cefclient/browser/window_test_runner_mac.h" #import #include "include/wrapper/cef_helpers.h" -#include "cefclient/browser/main_message_loop.h" +#include "tests/shared/browser/main_message_loop.h" namespace client { namespace window_test { diff --git a/tests/cefclient/browser/window_test_runner_views.cc b/tests/cefclient/browser/window_test_runner_views.cc index 3887ed6d..ef7a8f94 100644 --- a/tests/cefclient/browser/window_test_runner_views.cc +++ b/tests/cefclient/browser/window_test_runner_views.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_test_runner_views.h" +#include "tests/cefclient/browser/window_test_runner_views.h" #include "include/views/cef_browser_view.h" #include "include/views/cef_display.h" diff --git a/tests/cefclient/browser/window_test_runner_views.h b/tests/cefclient/browser/window_test_runner_views.h index 794f3df5..0b11b29e 100644 --- a/tests/cefclient/browser/window_test_runner_views.h +++ b/tests/cefclient/browser/window_test_runner_views.h @@ -6,7 +6,7 @@ #define CEF_TESTS_CEFCLIENT_BROWSER_WINDOW_TEST_RUNNER_VIEWS_H_ #pragma once -#include "cefclient/browser/window_test_runner.h" +#include "tests/cefclient/browser/window_test_runner.h" namespace client { namespace window_test { diff --git a/tests/cefclient/browser/window_test_runner_win.cc b/tests/cefclient/browser/window_test_runner_win.cc index 44bad725..5d36e373 100644 --- a/tests/cefclient/browser/window_test_runner_win.cc +++ b/tests/cefclient/browser/window_test_runner_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_test_runner_win.h" +#include "tests/cefclient/browser/window_test_runner_win.h" -#include "cefclient/browser/main_message_loop.h" +#include "tests/shared/browser/main_message_loop.h" namespace client { namespace window_test { diff --git a/tests/cefclient/browser/window_test_runner_win.h b/tests/cefclient/browser/window_test_runner_win.h index 4dd0a3ab..a3aee6db 100644 --- a/tests/cefclient/browser/window_test_runner_win.h +++ b/tests/cefclient/browser/window_test_runner_win.h @@ -6,7 +6,7 @@ #define CEF_TESTS_CEFCLIENT_BROWSER_WINDOW_TEST_RUNNER_WIN_H_ #pragma once -#include "cefclient/browser/window_test_runner.h" +#include "tests/cefclient/browser/window_test_runner.h" namespace client { namespace window_test { diff --git a/tests/cefclient/cefclient_gtk.cc b/tests/cefclient/cefclient_gtk.cc index 0fccf8d6..a4ba96ad 100644 --- a/tests/cefclient/cefclient_gtk.cc +++ b/tests/cefclient/cefclient_gtk.cc @@ -18,14 +18,14 @@ #include "include/cef_app.h" #include "include/cef_command_line.h" #include "include/wrapper/cef_helpers.h" -#include "cefclient/browser/client_app_browser.h" -#include "cefclient/browser/main_context_impl.h" -#include "cefclient/browser/main_message_loop_external_pump.h" -#include "cefclient/browser/main_message_loop_std.h" -#include "cefclient/browser/test_runner.h" -#include "cefclient/common/client_app_other.h" -#include "cefclient/common/client_switches.h" -#include "cefclient/renderer/client_app_renderer.h" +#include "tests/cefclient/browser/main_context_impl.h" +#include "tests/cefclient/browser/test_runner.h" +#include "tests/shared/browser/client_app_browser.h" +#include "tests/shared/browser/main_message_loop_external_pump.h" +#include "tests/shared/browser/main_message_loop_std.h" +#include "tests/shared/common/client_app_other.h" +#include "tests/shared/common/client_switches.h" +#include "tests/shared/renderer/client_app_renderer.h" namespace client { namespace { diff --git a/tests/cefclient/cefclient_mac.mm b/tests/cefclient/cefclient_mac.mm index 4c5dbba6..ab73ecef 100644 --- a/tests/cefclient/cefclient_mac.mm +++ b/tests/cefclient/cefclient_mac.mm @@ -6,14 +6,14 @@ #import #include "include/cef_app.h" #import "include/cef_application_mac.h" -#include "cefclient/browser/client_app_browser.h" -#include "cefclient/browser/main_context_impl.h" -#include "cefclient/browser/main_message_loop_external_pump.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_switches.h" +#include "tests/cefclient/browser/main_context_impl.h" +#include "tests/cefclient/browser/resource.h" +#include "tests/cefclient/browser/root_window.h" +#include "tests/cefclient/browser/test_runner.h" +#include "tests/shared/browser/client_app_browser.h" +#include "tests/shared/browser/main_message_loop_external_pump.h" +#include "tests/shared/browser/main_message_loop_std.h" +#include "tests/shared/common/client_switches.h" namespace { diff --git a/tests/cefclient/cefclient_win.cc b/tests/cefclient/cefclient_win.cc index 24a10c1e..e05d0f97 100644 --- a/tests/cefclient/cefclient_win.cc +++ b/tests/cefclient/cefclient_win.cc @@ -7,16 +7,16 @@ #include "include/base/cef_scoped_ptr.h" #include "include/cef_command_line.h" #include "include/cef_sandbox_win.h" -#include "cefclient/browser/client_app_browser.h" -#include "cefclient/browser/main_context_impl.h" -#include "cefclient/browser/main_message_loop_external_pump.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_other.h" -#include "cefclient/common/client_switches.h" -#include "cefclient/renderer/client_app_renderer.h" +#include "tests/cefclient/browser/main_context_impl.h" +#include "tests/cefclient/browser/main_message_loop_multithreaded_win.h" +#include "tests/cefclient/browser/root_window_manager.h" +#include "tests/cefclient/browser/test_runner.h" +#include "tests/shared/browser/client_app_browser.h" +#include "tests/shared/browser/main_message_loop_external_pump.h" +#include "tests/shared/browser/main_message_loop_std.h" +#include "tests/shared/common/client_app_other.h" +#include "tests/shared/common/client_switches.h" +#include "tests/shared/renderer/client_app_renderer.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/common/client_app_delegates_common.cc b/tests/cefclient/common/client_app_delegates_common.cc index c5a9acb1..aa73d25b 100644 --- a/tests/cefclient/common/client_app_delegates_common.cc +++ b/tests/cefclient/common/client_app_delegates_common.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/common/client_app.h" -#include "cefclient/common/scheme_test_common.h" +#include "tests/cefclient/common/scheme_test_common.h" +#include "tests/shared/common/client_app.h" namespace client { diff --git a/tests/cefclient/common/scheme_test_common.cc b/tests/cefclient/common/scheme_test_common.cc index ba34488f..e8124624 100644 --- a/tests/cefclient/common/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/common/scheme_test_common.h" +#include "tests/cefclient/common/scheme_test_common.h" #include "include/cef_scheme.h" diff --git a/tests/cefclient/renderer/client_app_delegates_renderer.cc b/tests/cefclient/renderer/client_app_delegates_renderer.cc index 3e6f1710..bae180d4 100644 --- a/tests/cefclient/renderer/client_app_delegates_renderer.cc +++ b/tests/cefclient/renderer/client_app_delegates_renderer.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/renderer/client_app_renderer.h" -#include "cefclient/renderer/client_renderer.h" -#include "cefclient/renderer/performance_test.h" +#include "tests/cefclient/renderer/client_renderer.h" +#include "tests/cefclient/renderer/performance_test.h" +#include "tests/shared/renderer/client_app_renderer.h" namespace client { diff --git a/tests/cefclient/renderer/client_renderer.cc b/tests/cefclient/renderer/client_renderer.cc index 86910a25..9e160c4a 100644 --- a/tests/cefclient/renderer/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/renderer/client_renderer.h" +#include "tests/cefclient/renderer/client_renderer.h" #include #include diff --git a/tests/cefclient/renderer/client_renderer.h b/tests/cefclient/renderer/client_renderer.h index f90ace08..08076458 100644 --- a/tests/cefclient/renderer/client_renderer.h +++ b/tests/cefclient/renderer/client_renderer.h @@ -7,7 +7,7 @@ #pragma once #include "include/cef_base.h" -#include "cefclient/renderer/client_app_renderer.h" +#include "tests/shared/renderer/client_app_renderer.h" namespace client { namespace renderer { diff --git a/tests/cefclient/renderer/performance_test.cc b/tests/cefclient/renderer/performance_test.cc index 02d5f4c5..d6b31d69 100644 --- a/tests/cefclient/renderer/performance_test.cc +++ b/tests/cefclient/renderer/performance_test.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/renderer/performance_test.h" +#include "tests/cefclient/renderer/performance_test.h" #include #include #include "include/base/cef_logging.h" #include "include/wrapper/cef_stream_resource_handler.h" -#include "cefclient/renderer/performance_test_setup.h" +#include "tests/cefclient/renderer/performance_test_setup.h" namespace client { namespace performance_test { diff --git a/tests/cefclient/renderer/performance_test.h b/tests/cefclient/renderer/performance_test.h index 8570640f..ce016bf1 100644 --- a/tests/cefclient/renderer/performance_test.h +++ b/tests/cefclient/renderer/performance_test.h @@ -6,7 +6,7 @@ #define CEF_TESTS_CEFCLIENT_RENDERER_PERFORMANCE_TEST_H_ #pragma once -#include "cefclient/renderer/client_app_renderer.h" +#include "tests/shared/renderer/client_app_renderer.h" namespace client { namespace performance_test { diff --git a/tests/cefclient/renderer/performance_test_tests.cc b/tests/cefclient/renderer/performance_test_tests.cc index b63b5939..3f76b78f 100644 --- a/tests/cefclient/renderer/performance_test_tests.cc +++ b/tests/cefclient/renderer/performance_test_tests.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/renderer/performance_test.h" -#include "cefclient/renderer/performance_test_setup.h" #include "include/cef_v8.h" +#include "tests/cefclient/renderer/performance_test.h" +#include "tests/cefclient/renderer/performance_test_setup.h" namespace client { namespace performance_test { diff --git a/tests/cefclient/resources/win/cefclient.rc b/tests/cefclient/resources/win/cefclient.rc index 0564092b..6ae63b36 100644 --- a/tests/cefclient/resources/win/cefclient.rc +++ b/tests/cefclient/resources/win/cefclient.rc @@ -1,6 +1,6 @@ // Microsoft Visual C++ generated resource script. // -#include "cefclient/browser/resource.h" +#include "tests/cefclient/browser/resource.h" #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// @@ -37,10 +37,10 @@ IDS_LOCALSTORAGE_HTML BINARY "..\\localstorage.html" IDS_LOGO_PNG BINARY "..\\logo.png" IDS_MENU_ICON_1X_PNG BINARY "..\\menu_icon.1x.png" IDS_MENU_ICON_2X_PNG BINARY "..\\menu_icon.2x.png" -IDS_OSRTEST_HTML BINARY "..\\osr_test.html" +IDS_OSRTEST_HTML BINARY "..\\..\\..\\shared\\resources\\osr_test.html" IDS_OTHER_TESTS_HTML BINARY "..\\other_tests.html" -IDS_PDF_HTML BINARY "..\\pdf.html" -IDS_PDF_PDF BINARY "..\\pdf.pdf" +IDS_PDF_HTML BINARY "..\\..\\..\\shared\\resources\\pdf.html" +IDS_PDF_PDF BINARY "..\\..\\..\\shared\\resources\\pdf.pdf" IDS_PERFORMANCE_HTML BINARY "..\\performance.html" IDS_PERFORMANCE2_HTML BINARY "..\\performance2.html" IDS_PREFERENCES_HTML BINARY "..\\preferences.html" @@ -48,8 +48,8 @@ IDS_RESPONSE_FILTER_HTML BINARY "..\\response_filter.html" IDS_TRANSPARENCY_HTML BINARY "..\\transparency.html" IDS_URLREQUEST_HTML BINARY "..\\urlrequest.html" IDS_WINDOW_HTML BINARY "..\\window.html" -IDS_WINDOW_ICON_1X_PNG BINARY "..\\window_icon.1x.png" -IDS_WINDOW_ICON_2X_PNG BINARY "..\\window_icon.2x.png" +IDS_WINDOW_ICON_1X_PNG BINARY "..\\..\\..\\shared\\resources\\window_icon.1x.png" +IDS_WINDOW_ICON_2X_PNG BINARY "..\\..\\..\\shared\\resources\\window_icon.2x.png" IDS_XMLHTTPREQUEST_HTML BINARY "..\\xmlhttprequest.html" ///////////////////////////////////////////////////////////////////////////// @@ -203,7 +203,6 @@ STRINGTABLE BEGIN IDS_APP_TITLE "cefclient" IDC_CEFCLIENT "CEFCLIENT" - IDS_OSR_WIDGET_CLASS "CEFCLIENT-OSR-WIDGET" END #endif // English (U.S.) resources diff --git a/tests/cefsimple/cefsimple_linux.cc b/tests/cefsimple/cefsimple_linux.cc index f937dbac..ca1654f8 100644 --- a/tests/cefsimple/cefsimple_linux.cc +++ b/tests/cefsimple/cefsimple_linux.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 "cefsimple/simple_app.h" +#include "tests/cefsimple/simple_app.h" #include diff --git a/tests/cefsimple/cefsimple_mac.mm b/tests/cefsimple/cefsimple_mac.mm index f4658352..8b487452 100644 --- a/tests/cefsimple/cefsimple_mac.mm +++ b/tests/cefsimple/cefsimple_mac.mm @@ -5,8 +5,8 @@ #import -#include "cefsimple/simple_app.h" -#include "cefsimple/simple_handler.h" +#include "tests/cefsimple/simple_app.h" +#include "tests/cefsimple/simple_handler.h" #include "include/cef_application_mac.h" #include "include/wrapper/cef_helpers.h" diff --git a/tests/cefsimple/cefsimple_win.cc b/tests/cefsimple/cefsimple_win.cc index 96c0b942..1d0de68a 100644 --- a/tests/cefsimple/cefsimple_win.cc +++ b/tests/cefsimple/cefsimple_win.cc @@ -4,7 +4,7 @@ #include -#include "cefsimple/simple_app.h" +#include "tests/cefsimple/simple_app.h" #include "include/cef_sandbox_win.h" diff --git a/tests/cefsimple/simple_app.cc b/tests/cefsimple/simple_app.cc index 009c22a7..24e2ead1 100644 --- a/tests/cefsimple/simple_app.cc +++ b/tests/cefsimple/simple_app.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 "cefsimple/simple_app.h" +#include "tests/cefsimple/simple_app.h" #include -#include "cefsimple/simple_handler.h" +#include "tests/cefsimple/simple_handler.h" #include "include/cef_browser.h" #include "include/cef_command_line.h" #include "include/views/cef_browser_view.h" diff --git a/tests/cefsimple/simple_handler.cc b/tests/cefsimple/simple_handler.cc index 0aeebd0a..0280bf51 100644 --- a/tests/cefsimple/simple_handler.cc +++ b/tests/cefsimple/simple_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 "cefsimple/simple_handler.h" +#include "tests/cefsimple/simple_handler.h" #include #include diff --git a/tests/cefsimple/simple_handler_linux.cc b/tests/cefsimple/simple_handler_linux.cc index 8468afe3..25adea79 100644 --- a/tests/cefsimple/simple_handler_linux.cc +++ b/tests/cefsimple/simple_handler_linux.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 "cefsimple/simple_handler.h" +#include "tests/cefsimple/simple_handler.h" #include #include diff --git a/tests/cefsimple/simple_handler_mac.mm b/tests/cefsimple/simple_handler_mac.mm index 92e65f71..5a25c60f 100644 --- a/tests/cefsimple/simple_handler_mac.mm +++ b/tests/cefsimple/simple_handler_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 "cefsimple/simple_handler.h" +#include "tests/cefsimple/simple_handler.h" #import diff --git a/tests/cefsimple/simple_handler_win.cc b/tests/cefsimple/simple_handler_win.cc index 3e4d771b..3577663d 100644 --- a/tests/cefsimple/simple_handler_win.cc +++ b/tests/cefsimple/simple_handler_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 "cefsimple/simple_handler.h" +#include "tests/cefsimple/simple_handler.h" #include #include diff --git a/tests/gtest/CMakeLists.txt.in b/tests/gtest/CMakeLists.txt.in new file mode 100644 index 00000000..32fcc875 --- /dev/null +++ b/tests/gtest/CMakeLists.txt.in @@ -0,0 +1,30 @@ +# Copyright 2016 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. + +set(CEF_TARGET "cef_gtest") + +set(GTEST_SRCS + src/gtest-all.cc + ) +source_group(cef_gtest FILES ${GTEST_SRCS}) + +add_library(${CEF_TARGET} ${GTEST_SRCS}) + +# Start with CEF default properties. +SET_LIBRARY_TARGET_PROPERTIES(${CEF_TARGET}) + +# The gtest-all.cc file uses #include "gtest/gtest.h" +target_include_directories(${CEF_TARGET} PRIVATE "include") + +# In order to allow regex matches in gtest to be shared between Windows +# and other systems we tell gtest to always use it's internal engine. +target_compile_definitions(${CEF_TARGET} PRIVATE -DGTEST_HAS_POSIX_RE=0 -DGTEST_LANG_CXX11=1) + +# All dependent targets are unit tests. +target_compile_definitions(${CEF_TARGET} PUBLIC -DUNIT_TEST) + +if(OS_WINDOWS) + # Disable unused variable warning. + target_compile_options(${CEF_TARGET} PRIVATE "/wd4800") +endif() diff --git a/tests/gtest/README.cef.in b/tests/gtest/README.cef.in new file mode 100644 index 00000000..1c15e2e9 --- /dev/null +++ b/tests/gtest/README.cef.in @@ -0,0 +1,14 @@ +Name: Google C++ Testing Framework +Short Name: gtest +URL: https://github.com/google/googletest +License: BSD (see LICENSE file) + +Description: +Fuzed (single header/source file) version of GoogleTest. Generated from the +Chromium source checkout with the following command: + +cd /path/to/chromium/src/testing/gtest/scripts +./fuse_gtest_files.py + +Local Modifications: +None. diff --git a/tests/gtest/include/gtest/gtest.h b/tests/gtest/include/gtest/gtest.h new file mode 100644 index 00000000..aece904a --- /dev/null +++ b/tests/gtest/include/gtest/gtest.h @@ -0,0 +1,9 @@ +// Copyright 2016 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 GoogleTest from the Chromium source location. This file will be +// re-written in the CEF binary distribution to include a fuzed version of +// GoogleTest from the distribution tests/ folder. + +#include "testing/gtest/include/gtest/gtest.h" diff --git a/tests/cefclient/browser/client_app_browser.cc b/tests/shared/browser/client_app_browser.cc similarity index 95% rename from tests/cefclient/browser/client_app_browser.cc rename to tests/shared/browser/client_app_browser.cc index c716d344..ae0abb8a 100644 --- a/tests/cefclient/browser/client_app_browser.cc +++ b/tests/shared/browser/client_app_browser.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/browser/client_app_browser.h" +#include "tests/shared/browser/client_app_browser.h" #include "include/base/cef_logging.h" #include "include/cef_cookie.h" -#include "cefclient/browser/main_message_loop_external_pump.h" -#include "cefclient/common/client_switches.h" +#include "tests/shared/browser/main_message_loop_external_pump.h" +#include "tests/shared/common/client_switches.h" namespace client { diff --git a/tests/cefclient/browser/client_app_browser.h b/tests/shared/browser/client_app_browser.h similarity index 91% rename from tests/cefclient/browser/client_app_browser.h rename to tests/shared/browser/client_app_browser.h index 9042ec14..855dcd7d 100644 --- a/tests/cefclient/browser/client_app_browser.h +++ b/tests/shared/browser/client_app_browser.h @@ -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. -#ifndef CEF_TESTS_CEFCLIENT_BROWSER_CLIENT_APP_BROWSER_H_ -#define CEF_TESTS_CEFCLIENT_BROWSER_CLIENT_APP_BROWSER_H_ +#ifndef CEF_TESTS_SHARED_BROWSER_CLIENT_APP_BROWSER_H_ +#define CEF_TESTS_SHARED_BROWSER_CLIENT_APP_BROWSER_H_ #pragma once #include -#include "cefclient/common/client_app.h" +#include "tests/shared/common/client_app.h" namespace client { @@ -79,4 +79,4 @@ class ClientAppBrowser : public ClientApp, } // namespace client -#endif // CEF_TESTS_CEFCLIENT_BROWSER_CLIENT_APP_BROWSER_H_ +#endif // CEF_TESTS_SHARED_BROWSER_CLIENT_APP_BROWSER_H_ diff --git a/tests/cefclient/browser/geometry_util.cc b/tests/shared/browser/geometry_util.cc similarity index 96% rename from tests/cefclient/browser/geometry_util.cc rename to tests/shared/browser/geometry_util.cc index 3c20cf27..206edbc8 100644 --- a/tests/cefclient/browser/geometry_util.cc +++ b/tests/shared/browser/geometry_util.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/geometry_util.h" +#include "tests/shared/browser/geometry_util.h" #include diff --git a/tests/cefclient/browser/geometry_util.h b/tests/shared/browser/geometry_util.h similarity index 81% rename from tests/cefclient/browser/geometry_util.h rename to tests/shared/browser/geometry_util.h index 64cf9e8f..1f1e188a 100644 --- a/tests/cefclient/browser/geometry_util.h +++ b/tests/shared/browser/geometry_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_BROWSER_GEOMETRY_UTIL_H_ -#define CEF_TESTS_CEFCLIENT_BROWSER_GEOMETRY_UTIL_H_ +#ifndef CEF_TESTS_SHARED_BROWSER_GEOMETRY_UTIL_H_ +#define CEF_TESTS_SHARED_BROWSER_GEOMETRY_UTIL_H_ #pragma once #include "include/internal/cef_types_wrappers.h" @@ -20,4 +20,4 @@ void DeviceToLogical(CefMouseEvent& value, float device_scale_factor); } // namespace client -#endif // CEF_TESTS_CEFCLIENT_BROWSER_GEOMETRY_UTIL_H_ +#endif // CEF_TESTS_SHARED_BROWSER_GEOMETRY_UTIL_H_ diff --git a/tests/cefclient/browser/main_message_loop.cc b/tests/shared/browser/main_message_loop.cc similarity index 93% rename from tests/cefclient/browser/main_message_loop.cc rename to tests/shared/browser/main_message_loop.cc index a29e29ff..dc6f879b 100644 --- a/tests/cefclient/browser/main_message_loop.cc +++ b/tests/shared/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/browser/main_message_loop.h" +#include "tests/shared/browser/main_message_loop.h" #include "include/cef_task.h" #include "include/wrapper/cef_closure_task.h" diff --git a/tests/cefclient/browser/main_message_loop.h b/tests/shared/browser/main_message_loop.h similarity index 94% rename from tests/cefclient/browser/main_message_loop.h rename to tests/shared/browser/main_message_loop.h index ad6a09c4..59dc72c6 100644 --- a/tests/cefclient/browser/main_message_loop.h +++ b/tests/shared/browser/main_message_loop.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_BROWSER_MAIN_MESSAGE_LOOP_H_ -#define CEF_TESTS_CEFCLIENT_BROWSER_MAIN_MESSAGE_LOOP_H_ +#ifndef CEF_TESTS_SHARED_BROWSER_MAIN_MESSAGE_LOOP_H_ +#define CEF_TESTS_SHARED_BROWSER_MAIN_MESSAGE_LOOP_H_ #pragma once #include "include/base/cef_bind.h" @@ -105,4 +105,4 @@ struct DeleteOnMainThread { } // namespace client -#endif // CEF_TESTS_CEFCLIENT_BROWSER_MAIN_MESSAGE_LOOP_H_ +#endif // CEF_TESTS_SHARED_BROWSER_MAIN_MESSAGE_LOOP_H_ diff --git a/tests/cefclient/browser/main_message_loop_external_pump.cc b/tests/shared/browser/main_message_loop_external_pump.cc similarity index 96% rename from tests/cefclient/browser/main_message_loop_external_pump.cc rename to tests/shared/browser/main_message_loop_external_pump.cc index cd2ef27c..d64f6dc0 100644 --- a/tests/cefclient/browser/main_message_loop_external_pump.cc +++ b/tests/shared/browser/main_message_loop_external_pump.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/browser/main_message_loop_external_pump.h" +#include "tests/shared/browser/main_message_loop_external_pump.h" #include #include "include/cef_app.h" #include "include/wrapper/cef_helpers.h" -#include "cefclient/browser/main_message_loop.h" +#include "tests/shared/browser/main_message_loop.h" namespace client { diff --git a/tests/cefclient/browser/main_message_loop_external_pump.h b/tests/shared/browser/main_message_loop_external_pump.h similarity index 90% rename from tests/cefclient/browser/main_message_loop_external_pump.h rename to tests/shared/browser/main_message_loop_external_pump.h index 2a373476..891eadc9 100644 --- a/tests/cefclient/browser/main_message_loop_external_pump.h +++ b/tests/shared/browser/main_message_loop_external_pump.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_BROWSER_MAIN_MESSAGE_LOOP_EXTERNAL_PUMP_H_ -#define CEF_TESTS_CEFCLIENT_BROWSER_MAIN_MESSAGE_LOOP_EXTERNAL_PUMP_H_ +#ifndef CEF_TESTS_SHARED_BROWSER_MAIN_MESSAGE_LOOP_EXTERNAL_PUMP_H_ +#define CEF_TESTS_SHARED_BROWSER_MAIN_MESSAGE_LOOP_EXTERNAL_PUMP_H_ #pragma once -#include "cefclient/browser/main_message_loop_std.h" +#include "tests/shared/browser/main_message_loop_std.h" namespace client { @@ -67,4 +67,4 @@ class MainMessageLoopExternalPump : public MainMessageLoopStd { } // namespace client -#endif // CEF_TESTS_CEFCLIENT_BROWSER_MAIN_MESSAGE_LOOP_EXTERNAL_PUMP_H_ +#endif // CEF_TESTS_SHARED_BROWSER_MAIN_MESSAGE_LOOP_EXTERNAL_PUMP_H_ diff --git a/tests/cefclient/browser/main_message_loop_external_pump_linux.cc b/tests/shared/browser/main_message_loop_external_pump_linux.cc similarity index 99% rename from tests/cefclient/browser/main_message_loop_external_pump_linux.cc rename to tests/shared/browser/main_message_loop_external_pump_linux.cc index 3b6fdca3..f3b609b8 100644 --- a/tests/cefclient/browser/main_message_loop_external_pump_linux.cc +++ b/tests/shared/browser/main_message_loop_external_pump_linux.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/main_message_loop_external_pump.h" +#include "tests/shared/browser/main_message_loop_external_pump.h" #include #include diff --git a/tests/cefclient/browser/main_message_loop_external_pump_mac.mm b/tests/shared/browser/main_message_loop_external_pump_mac.mm similarity index 98% rename from tests/cefclient/browser/main_message_loop_external_pump_mac.mm rename to tests/shared/browser/main_message_loop_external_pump_mac.mm index 1496b6f7..995367e6 100644 --- a/tests/cefclient/browser/main_message_loop_external_pump_mac.mm +++ b/tests/shared/browser/main_message_loop_external_pump_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/main_message_loop_external_pump.h" +#include "tests/shared/browser/main_message_loop_external_pump.h" #import #import diff --git a/tests/cefclient/browser/main_message_loop_external_pump_win.cc b/tests/shared/browser/main_message_loop_external_pump_win.cc similarity index 97% rename from tests/cefclient/browser/main_message_loop_external_pump_win.cc rename to tests/shared/browser/main_message_loop_external_pump_win.cc index 0f610ba1..6df42375 100644 --- a/tests/cefclient/browser/main_message_loop_external_pump_win.cc +++ b/tests/shared/browser/main_message_loop_external_pump_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/browser/main_message_loop_external_pump.h" +#include "tests/shared/browser/main_message_loop_external_pump.h" #include #include "include/cef_app.h" -#include "cefclient/browser/util_win.h" +#include "tests/shared/browser/util_win.h" namespace client { diff --git a/tests/cefclient/browser/main_message_loop_std.cc b/tests/shared/browser/main_message_loop_std.cc similarity index 93% rename from tests/cefclient/browser/main_message_loop_std.cc rename to tests/shared/browser/main_message_loop_std.cc index 2dc34c1e..16067be1 100644 --- a/tests/cefclient/browser/main_message_loop_std.cc +++ b/tests/shared/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/browser/main_message_loop_std.h" +#include "tests/shared/browser/main_message_loop_std.h" #include "include/cef_app.h" diff --git a/tests/cefclient/browser/main_message_loop_std.h b/tests/shared/browser/main_message_loop_std.h similarity index 77% rename from tests/cefclient/browser/main_message_loop_std.h rename to tests/shared/browser/main_message_loop_std.h index 15aa11b5..22b34a55 100644 --- a/tests/cefclient/browser/main_message_loop_std.h +++ b/tests/shared/browser/main_message_loop_std.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_BROWSER_MAIN_MESSAGE_LOOP_STD_H_ -#define CEF_TESTS_CEFCLIENT_BROWSER_MAIN_MESSAGE_LOOP_STD_H_ +#ifndef CEF_TESTS_SHARED_BROWSER_MAIN_MESSAGE_LOOP_STD_H_ +#define CEF_TESTS_SHARED_BROWSER_MAIN_MESSAGE_LOOP_STD_H_ #pragma once -#include "cefclient/browser/main_message_loop.h" +#include "tests/shared/browser/main_message_loop.h" namespace client { @@ -32,4 +32,4 @@ class MainMessageLoopStd : public MainMessageLoop { } // namespace client -#endif // CEF_TESTS_CEFCLIENT_BROWSER_MAIN_MESSAGE_LOOP_STD_H_ +#endif // CEF_TESTS_SHARED_BROWSER_MAIN_MESSAGE_LOOP_STD_H_ diff --git a/tests/cefclient/browser/resource_util.cc b/tests/shared/browser/resource_util.cc similarity index 94% rename from tests/cefclient/browser/resource_util.cc rename to tests/shared/browser/resource_util.cc index 1715b93d..094429f8 100644 --- a/tests/cefclient/browser/resource_util.cc +++ b/tests/shared/browser/resource_util.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/resource_util.h" +#include "tests/shared/browser/resource_util.h" #include #include diff --git a/tests/cefclient/browser/resource_util.h b/tests/shared/browser/resource_util.h similarity index 88% rename from tests/cefclient/browser/resource_util.h rename to tests/shared/browser/resource_util.h index a114b35a..58717703 100644 --- a/tests/cefclient/browser/resource_util.h +++ b/tests/shared/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_BROWSER_RESOURCE_UTIL_H_ -#define CEF_TESTS_CEFCLIENT_BROWSER_RESOURCE_UTIL_H_ +#ifndef CEF_TESTS_SHARED_BROWSER_RESOURCE_UTIL_H_ +#define CEF_TESTS_SHARED_BROWSER_RESOURCE_UTIL_H_ #pragma once #include @@ -41,4 +41,4 @@ CefRefPtr LoadImageIcon(const char* icon_name); } // namespace client -#endif // CEF_TESTS_CEFCLIENT_BROWSER_RESOURCE_UTIL_H_ +#endif // CEF_TESTS_SHARED_BROWSER_RESOURCE_UTIL_H_ diff --git a/tests/shared/browser/resource_util_linux.cc b/tests/shared/browser/resource_util_linux.cc new file mode 100644 index 00000000..45d40680 --- /dev/null +++ b/tests/shared/browser/resource_util_linux.cc @@ -0,0 +1,36 @@ +// Copyright (c) 2013 The Chromium Embedded Framework Authors. +// Portions copyright (c) 2011 The Chromium 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 "tests/shared/browser/resource_util.h" + +#include +#include +#include + +namespace client { + +bool GetResourceDir(std::string& dir) { + char buff[1024]; + + // Retrieve the executable path. + ssize_t len = readlink("/proc/self/exe", buff, sizeof(buff)-1); + if (len == -1) + return false; + + buff[len] = 0; + + // Remove the executable name from the path. + char* pos = strrchr(buff, '/'); + if (!pos) + return false; + + // Add "files" to the path. + strcpy(pos+1, "files"); // NOLINT(runtime/printf) + dir = std::string(buff); + return true; +} + +} // namespace client + diff --git a/tests/cefclient/browser/resource_util_mac.mm b/tests/shared/browser/resource_util_mac.mm similarity index 97% rename from tests/cefclient/browser/resource_util_mac.mm rename to tests/shared/browser/resource_util_mac.mm index 0c314399..3134548e 100644 --- a/tests/cefclient/browser/resource_util_mac.mm +++ b/tests/shared/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/browser/resource_util.h" +#include "tests/shared/browser/resource_util.h" #import #include diff --git a/tests/cefclient/browser/resource_util_posix.cc b/tests/shared/browser/resource_util_posix.cc similarity index 96% rename from tests/cefclient/browser/resource_util_posix.cc rename to tests/shared/browser/resource_util_posix.cc index 00b8d6c4..ce7c8ba9 100644 --- a/tests/cefclient/browser/resource_util_posix.cc +++ b/tests/shared/browser/resource_util_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/browser/resource_util.h" +#include "tests/shared/browser/resource_util.h" #include diff --git a/tests/cefclient/browser/resource_util_win.cc b/tests/shared/browser/resource_util_win.cc similarity index 67% rename from tests/cefclient/browser/resource_util_win.cc rename to tests/shared/browser/resource_util_win.cc index 90d55f6e..21d11c6b 100644 --- a/tests/cefclient/browser/resource_util_win.cc +++ b/tests/shared/browser/resource_util_win.cc @@ -2,13 +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/browser/resource_util.h" +#include "tests/shared/browser/resource_util.h" #include "include/base/cef_logging.h" #include "include/cef_stream.h" #include "include/wrapper/cef_byte_read_handler.h" #include "include/wrapper/cef_stream_resource_handler.h" -#include "cefclient/browser/resource.h" namespace client { @@ -31,44 +30,6 @@ bool LoadBinaryResource(int binaryId, DWORD &dwSize, LPBYTE &pBytes) { return false; } -int GetResourceId(const char* resource_name) { - // Map of resource labels to BINARY id values. - static struct _resource_map { - char* name; - int id; - } resource_map[] = { - {"binding.html", IDS_BINDING_HTML}, - {"dialogs.html", IDS_DIALOGS_HTML}, - {"draggable.html", IDS_DRAGGABLE_HTML}, - {"drm.html", IDS_DRM_HTML}, - {"logo.png", IDS_LOGO_PNG}, - {"localstorage.html", IDS_LOCALSTORAGE_HTML}, - {"menu_icon.1x.png", IDS_MENU_ICON_1X_PNG}, - {"menu_icon.2x.png", IDS_MENU_ICON_2X_PNG}, - {"osr_test.html", IDS_OSRTEST_HTML}, - {"other_tests.html", IDS_OTHER_TESTS_HTML}, - {"pdf.html", IDS_PDF_HTML}, - {"pdf.pdf", IDS_PDF_PDF}, - {"performance.html", IDS_PERFORMANCE_HTML}, - {"performance2.html", IDS_PERFORMANCE2_HTML}, - {"preferences.html", IDS_PREFERENCES_HTML}, - {"response_filter.html", IDS_RESPONSE_FILTER_HTML}, - {"transparency.html", IDS_TRANSPARENCY_HTML}, - {"urlrequest.html", IDS_URLREQUEST_HTML}, - {"window.html", IDS_WINDOW_HTML}, - {"window_icon.1x.png", IDS_WINDOW_ICON_1X_PNG}, - {"window_icon.2x.png", IDS_WINDOW_ICON_2X_PNG}, - {"xmlhttprequest.html", IDS_XMLHTTPREQUEST_HTML}, - }; - - for (int i = 0; i < sizeof(resource_map)/sizeof(_resource_map); ++i) { - if (!strcmp(resource_map[i].name, resource_name)) - return resource_map[i].id; - } - - return 0; -} - // Provider of binary resources. class BinaryResourceProvider : public CefResourceManager::Provider { public: @@ -111,6 +72,9 @@ class BinaryResourceProvider : public CefResourceManager::Provider { } // namespace +// Implemented in resource_util_win_idmap.cc. +extern int GetResourceId(const char* resource_name); + bool LoadBinaryResource(const char* resource_name, std::string& resource_data) { int resource_id = GetResourceId(resource_name); if (resource_id == 0) diff --git a/tests/cefclient/browser/util_win.cc b/tests/shared/browser/util_win.cc similarity index 99% rename from tests/cefclient/browser/util_win.cc rename to tests/shared/browser/util_win.cc index 3e7ebb2b..468a1a7c 100644 --- a/tests/cefclient/browser/util_win.cc +++ b/tests/shared/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/browser/util_win.h" +#include "tests/shared/browser/util_win.h" #include "include/base/cef_logging.h" diff --git a/tests/cefclient/browser/util_win.h b/tests/shared/browser/util_win.h similarity index 87% rename from tests/cefclient/browser/util_win.h rename to tests/shared/browser/util_win.h index ea01bde2..83919e98 100644 --- a/tests/cefclient/browser/util_win.h +++ b/tests/shared/browser/util_win.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_BROWSER_UTIL_WIN_H_ -#define CEF_TESTS_CEFCLIENT_BROWSER_UTIL_WIN_H_ +#ifndef CEF_TESTS_SHARED_BROWSER_UTIL_WIN_H_ +#define CEF_TESTS_SHARED_BROWSER_UTIL_WIN_H_ #pragma once #include @@ -38,4 +38,4 @@ float GetDeviceScaleFactor(); } // namespace client -#endif // CEF_TESTS_CEFCLIENT_BROWSER_UTIL_WIN_H_ +#endif // CEF_TESTS_SHARED_BROWSER_UTIL_WIN_H_ diff --git a/tests/cefclient/common/client_app.cc b/tests/shared/common/client_app.cc similarity index 96% rename from tests/cefclient/common/client_app.cc rename to tests/shared/common/client_app.cc index 3b16117f..4083c142 100644 --- a/tests/cefclient/common/client_app.cc +++ b/tests/shared/common/client_app.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/common/client_app.h" +#include "tests/shared/common/client_app.h" #include "include/cef_command_line.h" diff --git a/tests/cefclient/common/client_app.h b/tests/shared/common/client_app.h similarity index 88% rename from tests/cefclient/common/client_app.h rename to tests/shared/common/client_app.h index cdbbfdad..d3661108 100644 --- a/tests/cefclient/common/client_app.h +++ b/tests/shared/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_COMMON_CLIENT_APP_H_ -#define CEF_TESTS_CEFCLIENT_COMMON_CLIENT_APP_H_ +#ifndef CEF_TESTS_SHARED_COMMON_CLIENT_APP_H_ +#define CEF_TESTS_SHARED_COMMON_CLIENT_APP_H_ #pragma once #include @@ -46,4 +46,4 @@ class ClientApp : public CefApp { } // namespace client -#endif // CEF_TESTS_CEFCLIENT_COMMON_CLIENT_APP_H_ +#endif // CEF_TESTS_SHARED_COMMON_CLIENT_APP_H_ diff --git a/tests/cefclient/common/client_app_other.cc b/tests/shared/common/client_app_other.cc similarity index 86% rename from tests/cefclient/common/client_app_other.cc rename to tests/shared/common/client_app_other.cc index 3041e287..354cbb11 100644 --- a/tests/cefclient/common/client_app_other.cc +++ b/tests/shared/common/client_app_other.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/common/client_app_other.h" +#include "tests/shared/common/client_app_other.h" #include "include/cef_command_line.h" diff --git a/tests/cefclient/common/client_app_other.h b/tests/shared/common/client_app_other.h similarity index 69% rename from tests/cefclient/common/client_app_other.h rename to tests/shared/common/client_app_other.h index c46731f2..b8a73428 100644 --- a/tests/cefclient/common/client_app_other.h +++ b/tests/shared/common/client_app_other.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_COMMON_CLIENT_APP_OTHER_H_ -#define CEF_TESTS_CEFCLIENT_COMMON_CLIENT_APP_OTHER_H_ +#ifndef CEF_TESTS_SHARED_COMMON_CLIENT_APP_OTHER_H_ +#define CEF_TESTS_SHARED_COMMON_CLIENT_APP_OTHER_H_ #pragma once -#include "cefclient/common/client_app.h" +#include "tests/shared/common/client_app.h" namespace client { @@ -22,4 +22,4 @@ class ClientAppOther : public ClientApp { } // namespace client -#endif // CEF_TESTS_CEFCLIENT_COMMON_CLIENT_APP_OTHER_H_ +#endif // CEF_TESTS_SHARED_COMMON_CLIENT_APP_OTHER_H_ diff --git a/tests/cefclient/common/client_switches.cc b/tests/shared/common/client_switches.cc similarity index 97% rename from tests/cefclient/common/client_switches.cc rename to tests/shared/common/client_switches.cc index 7239ae8b..b6d255e3 100644 --- a/tests/cefclient/common/client_switches.cc +++ b/tests/shared/common/client_switches.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/common/client_switches.h" +#include "tests/shared/common/client_switches.h" namespace client { namespace switches { diff --git a/tests/cefclient/common/client_switches.h b/tests/shared/common/client_switches.h similarity index 86% rename from tests/cefclient/common/client_switches.h rename to tests/shared/common/client_switches.h index 6d563730..288998cc 100644 --- a/tests/cefclient/common/client_switches.h +++ b/tests/shared/common/client_switches.h @@ -4,8 +4,8 @@ // Defines all of the command line switches used by cefclient. -#ifndef CEF_TESTS_CEFCLIENT_CEFCLIENT_COMMON_SWITCHES_H_ -#define CEF_TESTS_CEFCLIENT_CEFCLIENT_COMMON_SWITCHES_H_ +#ifndef CEF_TESTS_SHARED_SHARED_COMMON_SWITCHES_H_ +#define CEF_TESTS_SHARED_SHARED_COMMON_SWITCHES_H_ #pragma once namespace client { @@ -34,4 +34,4 @@ extern const char kSslClientCertificate[]; } // namespace switches } // namespace client -#endif // CEF_TESTS_CEFCLIENT_CEFCLIENT_COMMON_SWITCHES_H_ +#endif // CEF_TESTS_SHARED_SHARED_COMMON_SWITCHES_H_ diff --git a/tests/cefclient/process_helper_mac.cc b/tests/shared/process_helper_mac.cc similarity index 90% rename from tests/cefclient/process_helper_mac.cc rename to tests/shared/process_helper_mac.cc index 43c0c2cc..d94e322b 100644 --- a/tests/cefclient/process_helper_mac.cc +++ b/tests/shared/process_helper_mac.cc @@ -4,8 +4,8 @@ #include "include/cef_app.h" -#include "cefclient/common/client_app_other.h" -#include "cefclient/renderer/client_app_renderer.h" +#include "tests/shared/common/client_app_other.h" +#include "tests/shared/renderer/client_app_renderer.h" namespace client { diff --git a/tests/cefclient/renderer/client_app_renderer.cc b/tests/shared/renderer/client_app_renderer.cc similarity index 98% rename from tests/cefclient/renderer/client_app_renderer.cc rename to tests/shared/renderer/client_app_renderer.cc index 2b723d4a..e195e31c 100644 --- a/tests/cefclient/renderer/client_app_renderer.cc +++ b/tests/shared/renderer/client_app_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/renderer/client_app_renderer.h" +#include "tests/shared/renderer/client_app_renderer.h" #include "include/base/cef_logging.h" diff --git a/tests/cefclient/renderer/client_app_renderer.h b/tests/shared/renderer/client_app_renderer.h similarity index 96% rename from tests/cefclient/renderer/client_app_renderer.h rename to tests/shared/renderer/client_app_renderer.h index 49223639..15000920 100644 --- a/tests/cefclient/renderer/client_app_renderer.h +++ b/tests/shared/renderer/client_app_renderer.h @@ -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. -#ifndef CEF_TESTS_CEFCLIENT_RENDERER_CLIENT_APP_RENDERER_H_ -#define CEF_TESTS_CEFCLIENT_RENDERER_CLIENT_APP_RENDERER_H_ +#ifndef CEF_TESTS_SHARED_RENDERER_CLIENT_APP_RENDERER_H_ +#define CEF_TESTS_SHARED_RENDERER_CLIENT_APP_RENDERER_H_ #pragma once #include -#include "cefclient/common/client_app.h" +#include "tests/shared/common/client_app.h" namespace client { @@ -135,4 +135,4 @@ class ClientAppRenderer : public ClientApp, } // namespace client -#endif // CEF_TESTS_CEFCLIENT_RENDERER_CLIENT_APP_RENDERER_H_ +#endif // CEF_TESTS_SHARED_RENDERER_CLIENT_APP_RENDERER_H_ diff --git a/tests/cefclient/resources/osr_test.html b/tests/shared/resources/osr_test.html similarity index 100% rename from tests/cefclient/resources/osr_test.html rename to tests/shared/resources/osr_test.html diff --git a/tests/cefclient/resources/pdf.html b/tests/shared/resources/pdf.html similarity index 100% rename from tests/cefclient/resources/pdf.html rename to tests/shared/resources/pdf.html diff --git a/tests/cefclient/resources/pdf.pdf b/tests/shared/resources/pdf.pdf similarity index 100% rename from tests/cefclient/resources/pdf.pdf rename to tests/shared/resources/pdf.pdf diff --git a/tests/cefclient/resources/window_icon.1x.png b/tests/shared/resources/window_icon.1x.png similarity index 100% rename from tests/cefclient/resources/window_icon.1x.png rename to tests/shared/resources/window_icon.1x.png diff --git a/tests/cefclient/resources/window_icon.2x.png b/tests/shared/resources/window_icon.2x.png similarity index 100% rename from tests/cefclient/resources/window_icon.2x.png rename to tests/shared/resources/window_icon.2x.png diff --git a/tests/unittests/CMakeLists.txt.in b/tests/unittests/CMakeLists.txt.in new file mode 100644 index 00000000..fee20b1e --- /dev/null +++ b/tests/unittests/CMakeLists.txt.in @@ -0,0 +1,191 @@ +# Copyright (c) 2014 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. + +# +# Source files. +# + +# unittests sources. +{{ + 'prefix': 'unittests', + 'set': 'UNITTESTS_SRCS', + 'includes': [ + 'shared_sources_browser', + 'shared_sources_common', + 'shared_sources_linux:LINUX', + 'shared_sources_mac:MACOSX', + 'shared_sources_renderer:WINDOWS', + 'shared_sources_renderer:LINUX', + 'shared_sources_win:WINDOWS', + 'unittests_sources_common', + 'unittests_sources_linux:LINUX', + 'unittests_sources_mac:MACOSX', + 'unittests_sources_views:WINDOWS', + 'unittests_sources_views:LINUX', + 'unittests_sources_win:WINDOWS', + ], +}} + +# unittests helper sources. +{{ + 'prefix': 'unittests_helper', + 'set': 'UNITTESTS_HELPER_SRCS', + 'includes': [ + 'shared_sources_common', + 'shared_sources_mac_helper:MACOSX', + 'shared_sources_renderer', + 'unittests_sources_mac_helper:MACOSX', + ], +}} + +# unittests resources. +{{ + 'prefix': 'unittests_resources', + 'set': 'UNITTESTS_RESOURCES_SRCS', + 'includes': [ + 'shared_sources_resources', + 'unittests_bundle_resources_mac:MACOSX', + ], +}} + + +# +# Shared configuration. +# + +# Target executable names. +set(CEF_TARGET "cef_unittests") +if(OS_MACOSX) + set(CEF_HELPER_TARGET "cef_unittests Helper") +endif() + +# Logical target used to link the libcef library. +ADD_LOGICAL_TARGET("libcef_lib" "${CEF_LIB_DEBUG}" "${CEF_LIB_RELEASE}") + +# Determine the target output directory. +SET_CEF_TARGET_OUT_DIR() + + +# +# Linux configuration. +# + +if(OS_LINUX) + # Find required libraries and update compiler/linker variables. + FIND_LINUX_LIBRARIES("glib-2.0") + + # Executable target. + add_executable(${CEF_TARGET} ${UNITTESTS_SRCS} ${UNITTESTS_RESOURCES_SRCS}) + SET_EXECUTABLE_TARGET_PROPERTIES(${CEF_TARGET}) + add_dependencies(${CEF_TARGET} libcef_dll_wrapper cef_gtest) + target_link_libraries(${CEF_TARGET} libcef_lib libcef_dll_wrapper cef_gtest ${CEF_STANDARD_LIBS}) + + # Set rpath so that libraries can be placed next to the executable. + set_target_properties(${CEF_TARGET} PROPERTIES INSTALL_RPATH "$ORIGIN") + set_target_properties(${CEF_TARGET} PROPERTIES BUILD_WITH_INSTALL_RPATH TRUE) + set_target_properties(${CEF_TARGET} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CEF_TARGET_OUT_DIR}) + + # Copy binary and resource files to the target output directory. + COPY_FILES("${CEF_TARGET}" "${CEF_BINARY_FILES}" "${CEF_BINARY_DIR}" "${CEF_TARGET_OUT_DIR}") + COPY_FILES("${CEF_TARGET}" "${CEF_RESOURCE_FILES}" "${CEF_RESOURCE_DIR}" "${CEF_TARGET_OUT_DIR}") + + # Copy unittests resource files to the target output directory. + COPY_FILES("${CEF_TARGET}" "${UNITTESTS_RESOURCES_SRCS}" "${CMAKE_CURRENT_SOURCE_DIR}" "${CEF_TARGET_OUT_DIR}/unittests_files") + + # Set SUID permissions on the chrome-sandbox target. + SET_LINUX_SUID_PERMISSIONS("${CEF_TARGET}" "${CEF_TARGET_OUT_DIR}/chrome-sandbox") +endif() + + +# +# Mac OS X configuration. +# + +if(OS_MACOSX) + # Output paths for the app bundles. + set(CEF_APP "${CEF_TARGET_OUT_DIR}/${CEF_TARGET}.app") + set(CEF_HELPER_APP "${CEF_TARGET_OUT_DIR}/${CEF_HELPER_TARGET}.app") + + # Variable referenced from Info.plist files. + set(PRODUCT_NAME "${CEF_TARGET}") + + # Helper executable target. + add_executable(${CEF_HELPER_TARGET} MACOSX_BUNDLE ${UNITTESTS_HELPER_SRCS}) + SET_EXECUTABLE_TARGET_PROPERTIES(${CEF_HELPER_TARGET}) + add_dependencies(${CEF_HELPER_TARGET} libcef_dll_wrapper cef_gtest) + target_link_libraries(${CEF_HELPER_TARGET} libcef_lib libcef_dll_wrapper cef_gtest ${CEF_STANDARD_LIBS}) + set_target_properties(${CEF_HELPER_TARGET} PROPERTIES + MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/resources/mac/helper-Info.plist + ) + + # Fix the framework rpath in the helper executable. + FIX_MACOSX_HELPER_FRAMEWORK_RPATH(${CEF_HELPER_TARGET}) + + # Main executable target. + add_executable(${CEF_TARGET} MACOSX_BUNDLE ${UNITTESTS_RESOURCES_SRCS} ${UNITTESTS_SRCS}) + SET_EXECUTABLE_TARGET_PROPERTIES(${CEF_TARGET}) + add_dependencies(${CEF_TARGET} libcef_dll_wrapper cef_gtest "${CEF_HELPER_TARGET}") + target_link_libraries(${CEF_TARGET} libcef_lib libcef_dll_wrapper cef_gtest ${CEF_STANDARD_LIBS}) + set_target_properties(${CEF_TARGET} PROPERTIES + RESOURCE "${UNITTESTS_RESOURCES_SRCS}" + MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/resources/mac/Info.plist + ) + + # Copy files into the main app bundle. + add_custom_command( + TARGET ${CEF_TARGET} + POST_BUILD + # Copy the helper app bundle into the Frameworks directory. + COMMAND ${CMAKE_COMMAND} -E copy_directory + "${CEF_HELPER_APP}" + "${CEF_APP}/Contents/Frameworks/${CEF_HELPER_TARGET}.app" + # Copy the CEF framework into the Frameworks directory. + COMMAND ${CMAKE_COMMAND} -E copy_directory + "${CEF_BINARY_DIR}/Chromium Embedded Framework.framework" + "${CEF_APP}/Contents/Frameworks/Chromium Embedded Framework.framework" + VERBATIM + ) + + # Fix the framework rpath in the main executable. + FIX_MACOSX_MAIN_FRAMEWORK_RPATH(${CEF_TARGET}) + + if(NOT ${CMAKE_GENERATOR} STREQUAL "Xcode") + # Manually process and copy over resource files. + # The Xcode generator handles this via the set_target_properties RESOURCE directive. + set(PREFIXES "mac/") # Remove these prefixes from input file paths. + COPY_MACOSX_RESOURCES("${UNITTESTS_RESOURCES_SRCS}" "${PREFIXES}" "${CEF_TARGET}" "${CMAKE_CURRENT_SOURCE_DIR}" "${CEF_APP}") + endif() +endif() + + +# +# Windows configuration. +# + +if(OS_WINDOWS) + # Executable target. + add_executable(${CEF_TARGET} WIN32 ${UNITTESTS_SRCS} ${UNITTESTS_RESOURCES_SRCS}) + add_dependencies(${CEF_TARGET} libcef_dll_wrapper cef_gtest) + + list(APPEND CEF_EXE_LINKER_FLAGS + /SUBSYSTEM:CONSOLE # Configure as a console application. + ) + + SET_EXECUTABLE_TARGET_PROPERTIES(${CEF_TARGET}) + target_link_libraries(${CEF_TARGET} libcef_lib libcef_dll_wrapper cef_gtest ${CEF_STANDARD_LIBS}) + + if(USE_SANDBOX) + # Logical target used to link the cef_sandbox library. + ADD_LOGICAL_TARGET("cef_sandbox_lib" "${CEF_SANDBOX_LIB_DEBUG}" "${CEF_SANDBOX_LIB_RELEASE}") + target_link_libraries(${CEF_TARGET} cef_sandbox_lib ${CEF_SANDBOX_STANDARD_LIBS}) + endif() + + # Add the custom manifest files to the executable. + ADD_WINDOWS_MANIFEST("${CMAKE_CURRENT_SOURCE_DIR}/resources/win" "${CEF_TARGET}" "exe") + + # 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}") + COPY_FILES("${CEF_TARGET}" "${CEF_RESOURCE_FILES}" "${CEF_RESOURCE_DIR}" "${CEF_TARGET_OUT_DIR}") +endif() + diff --git a/tests/unittests/browser_info_map_unittest.cc b/tests/unittests/browser_info_map_unittest.cc index 7930c200..f29b9ae4 100644 --- a/tests/unittests/browser_info_map_unittest.cc +++ b/tests/unittests/browser_info_map_unittest.cc @@ -5,7 +5,7 @@ #include #include "libcef_dll/wrapper/cef_browser_info_map.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "tests/gtest/include/gtest/gtest.h" namespace { diff --git a/tests/unittests/client_app_delegates.cc b/tests/unittests/client_app_delegates.cc index b094a183..b2eaf9b1 100644 --- a/tests/unittests/client_app_delegates.cc +++ b/tests/unittests/client_app_delegates.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 "tests/cefclient/browser/client_app_browser.h" -#include "tests/cefclient/renderer/client_app_renderer.h" +#include "tests/shared/browser/client_app_browser.h" +#include "tests/shared/renderer/client_app_renderer.h" using client::ClientAppBrowser; using client::ClientAppRenderer; diff --git a/tests/unittests/command_line_unittest.cc b/tests/unittests/command_line_unittest.cc index f7ad3f7e..84ca67fe 100644 --- a/tests/unittests/command_line_unittest.cc +++ b/tests/unittests/command_line_unittest.cc @@ -3,7 +3,7 @@ // can be found in the LICENSE file. #include "include/cef_command_line.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "tests/gtest/include/gtest/gtest.h" namespace { diff --git a/tests/unittests/cookie_unittest.cc b/tests/unittests/cookie_unittest.cc index 6aecc825..342945d4 100644 --- a/tests/unittests/cookie_unittest.cc +++ b/tests/unittests/cookie_unittest.cc @@ -12,7 +12,7 @@ #include "include/cef_waitable_event.h" #include "include/wrapper/cef_closure_task.h" #include "include/wrapper/cef_scoped_temp_dir.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "tests/gtest/include/gtest/gtest.h" #include "tests/unittests/test_handler.h" #include "tests/unittests/test_suite.h" diff --git a/tests/unittests/dialog_unittest.cc b/tests/unittests/dialog_unittest.cc index 139ccff6..b72e550b 100644 --- a/tests/unittests/dialog_unittest.cc +++ b/tests/unittests/dialog_unittest.cc @@ -4,7 +4,7 @@ #include "include/base/cef_bind.h" #include "include/wrapper/cef_closure_task.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "tests/gtest/include/gtest/gtest.h" #include "tests/unittests/test_handler.h" #include "tests/unittests/test_util.h" diff --git a/tests/unittests/display_unittest.cc b/tests/unittests/display_unittest.cc index 485b6716..0fdc3096 100644 --- a/tests/unittests/display_unittest.cc +++ b/tests/unittests/display_unittest.cc @@ -6,7 +6,7 @@ #include "include/base/cef_bind.h" #include "include/wrapper/cef_closure_task.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "tests/gtest/include/gtest/gtest.h" #include "tests/unittests/test_handler.h" namespace { diff --git a/tests/unittests/dom_unittest.cc b/tests/unittests/dom_unittest.cc index 7f1c41da..f7fec6c3 100644 --- a/tests/unittests/dom_unittest.cc +++ b/tests/unittests/dom_unittest.cc @@ -3,8 +3,8 @@ // can be found in the LICENSE file. #include "include/cef_dom.h" -#include "testing/gtest/include/gtest/gtest.h" -#include "tests/cefclient/renderer/client_app_renderer.h" +#include "tests/gtest/include/gtest/gtest.h" +#include "tests/shared/renderer/client_app_renderer.h" #include "tests/unittests/test_handler.h" using client::ClientAppRenderer; diff --git a/tests/unittests/download_unittest.cc b/tests/unittests/download_unittest.cc index 9a3e9e45..2c700318 100644 --- a/tests/unittests/download_unittest.cc +++ b/tests/unittests/download_unittest.cc @@ -5,7 +5,7 @@ #include "include/cef_scheme.h" #include "include/wrapper/cef_closure_task.h" #include "include/wrapper/cef_scoped_temp_dir.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "tests/gtest/include/gtest/gtest.h" #include "tests/unittests/file_util.h" #include "tests/unittests/test_handler.h" diff --git a/tests/unittests/draggable_regions_unittest.cc b/tests/unittests/draggable_regions_unittest.cc index b60a2d84..75bae8d2 100644 --- a/tests/unittests/draggable_regions_unittest.cc +++ b/tests/unittests/draggable_regions_unittest.cc @@ -3,7 +3,7 @@ // can be found in the LICENSE file. #include "include/wrapper/cef_closure_task.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "tests/gtest/include/gtest/gtest.h" #include "tests/unittests/test_handler.h" namespace { @@ -113,7 +113,7 @@ class DraggableRegionsTestHandler : public TestHandler { } void DestroyTest() override { - EXPECT_EQ(false, did_call_on_draggable_regions_changed_); + EXPECT_FALSE(did_call_on_draggable_regions_changed_); TestHandler::DestroyTest(); } diff --git a/tests/unittests/file_util.cc b/tests/unittests/file_util.cc index 876ff54d..3969afa2 100644 --- a/tests/unittests/file_util.cc +++ b/tests/unittests/file_util.cc @@ -5,6 +5,7 @@ #include "tests/unittests/file_util.h" #include "include/base/cef_build.h" +#include "include/base/cef_scoped_ptr.h" #include "include/cef_task.h" #include @@ -43,7 +44,7 @@ bool ReadFileToString(const std::string& path, std::string* contents, return false; const size_t kBufferSize = 1 << 16; - std::unique_ptr buf(new char[kBufferSize]); + scoped_ptr buf(new char[kBufferSize]); size_t len; size_t size = 0; bool read_status = true; diff --git a/tests/unittests/file_util_unittest.cc b/tests/unittests/file_util_unittest.cc index cee4f115..09003a21 100644 --- a/tests/unittests/file_util_unittest.cc +++ b/tests/unittests/file_util_unittest.cc @@ -5,7 +5,7 @@ #include #include "include/wrapper/cef_scoped_temp_dir.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "tests/gtest/include/gtest/gtest.h" #include "tests/unittests/file_util.h" TEST(FileUtil, JoinPath) { diff --git a/tests/unittests/frame_unittest.cc b/tests/unittests/frame_unittest.cc index 06f1a0e1..7317a1a2 100644 --- a/tests/unittests/frame_unittest.cc +++ b/tests/unittests/frame_unittest.cc @@ -3,14 +3,14 @@ // can be found in the LICENSE file. #include "include/base/cef_bind.h" +#include "include/base/cef_scoped_ptr.h" #include "include/wrapper/cef_closure_task.h" #include "include/wrapper/cef_stream_resource_handler.h" -#include "tests/cefclient/browser/client_app_browser.h" -#include "tests/cefclient/renderer/client_app_renderer.h" +#include "tests/gtest/include/gtest/gtest.h" +#include "tests/shared/browser/client_app_browser.h" +#include "tests/shared/renderer/client_app_renderer.h" #include "tests/unittests/test_handler.h" -#include "testing/gtest/include/gtest/gtest.h" - using client::ClientAppBrowser; using client::ClientAppRenderer; @@ -226,7 +226,7 @@ class FrameNavExpectationsFactoryBrowser : public FrameNavExpectationsFactory { FrameNavExpectationsFactoryBrowser() {} // Create a new factory instance of the specified type. - static std::unique_ptr + static scoped_ptr FromID(FrameNavFactoryId id); // Returns true if there will be more navigations in the browser process @@ -236,18 +236,18 @@ class FrameNavExpectationsFactoryBrowser : public FrameNavExpectationsFactory { // Verify final expectations results. virtual bool Finalize() =0; - std::unique_ptr Create( + scoped_ptr Create( int nav, const FrameNavExpectations::CompletionCallback& completion_callback) { - std::unique_ptr expectations; + scoped_ptr expectations; expectations = Create(nav); expectations->set_completion_callback(completion_callback); - return expectations; + return expectations.Pass(); } protected: // Implement in the test-specific factory instance. - virtual std::unique_ptr Create(int nav) =0; + virtual scoped_ptr Create(int nav) =0; }; // Renderer process expectations factory abstact base class. @@ -256,21 +256,21 @@ class FrameNavExpectationsFactoryRenderer : public FrameNavExpectationsFactory { FrameNavExpectationsFactoryRenderer() {} // Create a new factory instance of the specified type. - static std::unique_ptr + static scoped_ptr FromID(FrameNavFactoryId id); - std::unique_ptr Create( + scoped_ptr Create( int nav, const FrameNavExpectations::CompletionCallback& completion_callback) { - std::unique_ptr expectations; + scoped_ptr expectations; expectations = Create(nav); expectations->set_completion_callback(completion_callback); - return expectations; + return expectations.Pass(); } protected: // Implement in the test-specific factory instance. - virtual std::unique_ptr Create(int nav) =0; + virtual scoped_ptr Create(int nav) =0; }; @@ -417,8 +417,8 @@ class FrameNavRendererTest : public ClientAppRenderer::Delegate, bool run_test_; int nav_; - std::unique_ptr factory_; - std::unique_ptr expectations_; + scoped_ptr factory_; + scoped_ptr expectations_; IMPLEMENT_REFCOUNTING(FrameNavRendererTest); }; @@ -568,8 +568,8 @@ class FrameNavTestHandler : public TestHandler { int nav_; TrackCallback got_destroyed_; - std::unique_ptr factory_; - std::unique_ptr expectations_; + scoped_ptr factory_; + scoped_ptr expectations_; IMPLEMENT_REFCOUNTING(FrameNavTestHandler); }; @@ -862,10 +862,10 @@ class FrameNavExpectationsFactoryBrowserTestSingleNavHarness : } protected: - std::unique_ptr Create(int nav) override { + scoped_ptr Create(int nav) override { EXPECT_FALSE(got_create_); got_create_.yes(); - return std::unique_ptr( + return scoped_ptr( new FrameNavExpectationsBrowserTestSingleNavHarness(nav)); } @@ -885,8 +885,8 @@ class FrameNavExpectationsFactoryRendererTestSingleNavHarness : } protected: - std::unique_ptr Create(int nav) override { - return std::unique_ptr( + scoped_ptr Create(int nav) override { + return scoped_ptr( new FrameNavExpectationsRendererTestSingleNavHarness(nav)); } }; @@ -1127,8 +1127,8 @@ class FrameNavExpectationsFactoryBrowserTestSingleNav : } protected: - std::unique_ptr Create(int nav) override { - return std::unique_ptr( + scoped_ptr Create(int nav) override { + return scoped_ptr( new FrameNavExpectationsBrowserTestSingleNav(nav)); } }; @@ -1143,8 +1143,8 @@ class FrameNavExpectationsFactoryRendererTestSingleNav : } protected: - std::unique_ptr Create(int nav) override { - return std::unique_ptr( + scoped_ptr Create(int nav) override { + return scoped_ptr( new FrameNavExpectationsRendererTestSingleNav(nav)); } }; @@ -1462,9 +1462,9 @@ class FrameNavExpectationsFactoryBrowserTestMultiNavHarness : } protected: - std::unique_ptr Create(int nav) override { + scoped_ptr Create(int nav) override { create_count_++; - return std::unique_ptr( + return scoped_ptr( new FrameNavExpectationsBrowserTestMultiNavHarness(nav)); } @@ -1484,8 +1484,8 @@ class FrameNavExpectationsFactoryRendererTestMultiNavHarness : } protected: - std::unique_ptr Create(int nav) override { - return std::unique_ptr( + scoped_ptr Create(int nav) override { + return scoped_ptr( new FrameNavExpectationsRendererTestMultiNavHarness(nav)); } }; @@ -1721,9 +1721,9 @@ class FrameNavExpectationsFactoryBrowserTestMultiNav : } protected: - std::unique_ptr Create(int nav) override { + scoped_ptr Create(int nav) override { nav_count_++; - return std::unique_ptr( + return scoped_ptr( new FrameNavExpectationsBrowserTestMultiNav(nav)); } @@ -1741,8 +1741,8 @@ class FrameNavExpectationsFactoryRendererTestMultiNav : } protected: - std::unique_ptr Create(int nav) override { - return std::unique_ptr( + scoped_ptr Create(int nav) override { + return scoped_ptr( new FrameNavExpectationsRendererTestMultiNav(nav)); } }; @@ -2175,9 +2175,9 @@ class FrameNavExpectationsFactoryBrowserTestNestedIframesSameOrigin : } protected: - std::unique_ptr Create(int nav) override { + scoped_ptr Create(int nav) override { create_count_++; - return std::unique_ptr( + return scoped_ptr( new FrameNavExpectationsBrowserTestNestedIframes(nav, true)); } @@ -2195,8 +2195,8 @@ class FrameNavExpectationsFactoryRendererTestNestedIframesSameOrigin : } protected: - std::unique_ptr Create(int nav) override { - return std::unique_ptr( + scoped_ptr Create(int nav) override { + return scoped_ptr( new FrameNavExpectationsRendererTestNestedIframes(nav, true)); } }; @@ -2230,9 +2230,9 @@ class FrameNavExpectationsFactoryBrowserTestNestedIframesDiffOrigin : } protected: - std::unique_ptr Create(int nav) override { + scoped_ptr Create(int nav) override { create_count_++; - return std::unique_ptr( + return scoped_ptr( new FrameNavExpectationsBrowserTestNestedIframes(nav, false)); } @@ -2250,8 +2250,8 @@ class FrameNavExpectationsFactoryRendererTestNestedIframesDiffOrigin : } protected: - std::unique_ptr Create(int nav) override { - return std::unique_ptr( + scoped_ptr Create(int nav) override { + return scoped_ptr( new FrameNavExpectationsRendererTestNestedIframes(nav, false)); } }; @@ -2268,9 +2268,9 @@ namespace { // must be listed here. // static -std::unique_ptr +scoped_ptr FrameNavExpectationsFactoryBrowser::FromID(FrameNavFactoryId id) { - std::unique_ptr factory; + scoped_ptr factory; switch (id) { case FNF_ID_SINGLE_NAV_HARNESS: factory.reset(new FrameNavExpectationsFactoryBrowserTestSingleNavHarness); @@ -2297,13 +2297,13 @@ std::unique_ptr } EXPECT_TRUE(factory); EXPECT_EQ(id, factory->GetID()); - return factory; + return factory.Pass(); } // static -std::unique_ptr +scoped_ptr FrameNavExpectationsFactoryRenderer::FromID(FrameNavFactoryId id) { - std::unique_ptr factory; + scoped_ptr factory; switch (id) { case FNF_ID_SINGLE_NAV_HARNESS: factory.reset( @@ -2331,7 +2331,7 @@ std::unique_ptr } EXPECT_TRUE(factory); EXPECT_EQ(id, factory->GetID()); - return factory; + return factory.Pass(); } } // namespace diff --git a/tests/unittests/geolocation_unittest.cc b/tests/unittests/geolocation_unittest.cc index d48aaa1f..4ca3e390 100644 --- a/tests/unittests/geolocation_unittest.cc +++ b/tests/unittests/geolocation_unittest.cc @@ -6,7 +6,7 @@ #include "include/cef_geolocation.h" #include "include/cef_waitable_event.h" #include "include/wrapper/cef_closure_task.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "tests/gtest/include/gtest/gtest.h" #include "tests/unittests/test_handler.h" #include "tests/unittests/test_util.h" diff --git a/tests/unittests/image_unittest.cc b/tests/unittests/image_unittest.cc index 3d4dc851..187845e6 100644 --- a/tests/unittests/image_unittest.cc +++ b/tests/unittests/image_unittest.cc @@ -3,11 +3,10 @@ // can be found in the LICENSE file. #include "include/cef_image.h" +#include "tests/gtest/include/gtest/gtest.h" #include "tests/unittests/image_util.h" #include "tests/unittests/thread_helper.h" -#include "testing/gtest/include/gtest/gtest.h" - namespace { // The expected image size in device independent pixels (DIPs). diff --git a/tests/unittests/image_util.cc b/tests/unittests/image_util.cc index f8f70391..0c4e8435 100644 --- a/tests/unittests/image_util.cc +++ b/tests/unittests/image_util.cc @@ -4,8 +4,8 @@ #include "tests/unittests/image_util.h" -#include "tests/cefclient/browser/resource_util.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "tests/gtest/include/gtest/gtest.h" +#include "tests/shared/browser/resource_util.h" namespace image_util { diff --git a/tests/unittests/jsdialog_unittest.cc b/tests/unittests/jsdialog_unittest.cc index f55299fc..e3793b74 100644 --- a/tests/unittests/jsdialog_unittest.cc +++ b/tests/unittests/jsdialog_unittest.cc @@ -4,7 +4,7 @@ #include "include/base/cef_bind.h" #include "include/wrapper/cef_closure_task.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "tests/gtest/include/gtest/gtest.h" #include "tests/unittests/test_handler.h" namespace { diff --git a/tests/unittests/life_span_unittest.cc b/tests/unittests/life_span_unittest.cc index df5e089c..0081a85c 100644 --- a/tests/unittests/life_span_unittest.cc +++ b/tests/unittests/life_span_unittest.cc @@ -4,7 +4,7 @@ #include "include/base/cef_bind.h" #include "include/wrapper/cef_closure_task.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "tests/gtest/include/gtest/gtest.h" #include "tests/unittests/routing_test_handler.h" namespace { diff --git a/tests/unittests/message_router_unittest.cc b/tests/unittests/message_router_unittest.cc index d605e80d..e86fee9d 100644 --- a/tests/unittests/message_router_unittest.cc +++ b/tests/unittests/message_router_unittest.cc @@ -11,9 +11,9 @@ #include "include/base/cef_weak_ptr.h" #include "include/cef_v8.h" #include "include/wrapper/cef_closure_task.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "tests/gtest/include/gtest/gtest.h" +#include "tests/shared/renderer/client_app_renderer.h" #include "tests/unittests/routing_test_handler.h" -#include "tests/cefclient/renderer/client_app_renderer.h" using client::ClientAppRenderer; @@ -2663,11 +2663,11 @@ class MultiQueryMultiLoadTestHandler : EXPECT_EQ(map, &manager_map_); if (manager_map_.HasAutoQueries()) { // Navigate all browsers somewhere else to terminate the auto queries. - BrowserMap map; - GetAllBrowsers(&map); + BrowserMap browser_map; + GetAllBrowsers(&browser_map); - BrowserMap::const_iterator it = map.begin(); - for (; it != map.end(); ++it) { + BrowserMap::const_iterator it = browser_map.begin(); + for (; it != browser_map.end(); ++it) { it->second->GetMainFrame()->LoadURL(cancel_url_); } } diff --git a/tests/unittests/navigation_unittest.cc b/tests/unittests/navigation_unittest.cc index cf9e7846..d9d5ce35 100644 --- a/tests/unittests/navigation_unittest.cc +++ b/tests/unittests/navigation_unittest.cc @@ -9,9 +9,9 @@ #include "include/cef_callback.h" #include "include/cef_scheme.h" #include "include/wrapper/cef_closure_task.h" -#include "testing/gtest/include/gtest/gtest.h" -#include "tests/cefclient/browser/client_app_browser.h" -#include "tests/cefclient/renderer/client_app_renderer.h" +#include "tests/gtest/include/gtest/gtest.h" +#include "tests/shared/browser/client_app_browser.h" +#include "tests/shared/renderer/client_app_renderer.h" #include "tests/unittests/test_handler.h" #include "tests/unittests/test_util.h" @@ -715,7 +715,6 @@ class HistoryDynamicIFramesNavTestHandler : public TestHandler { got_load_end_[nav_].yes(); if(nav_ == 3) { - CefString url = browser->GetMainFrame()->GetURL(); EXPECT_STREQ(url.ToString().c_str(), kDynIfrNav1); DestroyTest(); return; diff --git a/tests/unittests/os_rendering_unittest.cc b/tests/unittests/os_rendering_unittest.cc index 7af85b1a..f6808c78 100644 --- a/tests/unittests/os_rendering_unittest.cc +++ b/tests/unittests/os_rendering_unittest.cc @@ -7,8 +7,9 @@ #include "include/cef_v8.h" #include "include/wrapper/cef_closure_task.h" #include "include/wrapper/cef_stream_resource_handler.h" -#include "tests/cefclient/browser/geometry_util.h" -#include "tests/cefclient/browser/resource_util.h" +#include "tests/gtest/include/gtest/gtest.h" +#include "tests/shared/browser/geometry_util.h" +#include "tests/shared/browser/resource_util.h" #include "tests/unittests/routing_test_handler.h" #if defined(OS_MACOSX) @@ -869,14 +870,15 @@ class OSRTestHandler : public RoutingTestHandler, std::vector underlines; // Use a thin black underline by default. - cef_range_t range = {0, markedText.length()}; + CefRange range(0, static_cast(markedText.length())); cef_composition_underline_t line = { range, 0xFF000000, 0, false }; underlines.push_back(line); - CefRange replacement_range(0, markedText.length()); - CefRange selection_range(0,markedText.length()); + CefRange replacement_range(0, + static_cast(markedText.length())); + CefRange selection_range(0, static_cast(markedText.length())); // Composition should be updated browser->GetHost()->ImeSetComposition(markedText, underlines, @@ -914,14 +916,15 @@ class OSRTestHandler : public RoutingTestHandler, std::vector underlines; // Use a thin black underline by default. - cef_range_t range = {0, markedText.length()}; + CefRange range(0, markedText.length()); cef_composition_underline_t line = { range, 0xFF000000, 0, false }; underlines.push_back(line); - CefRange replacement_range(0, markedText.length()); - CefRange selection_range(0,markedText.length()); + CefRange replacement_range(0, + static_cast(markedText.length())); + CefRange selection_range(0, static_cast(markedText.length())); // This should update composition range and // trigger the compositionRangeChanged callback diff --git a/tests/unittests/os_rendering_unittest_mac.mm b/tests/unittests/os_rendering_unittest_mac.mm index 884160d3..6c9f8448 100644 --- a/tests/unittests/os_rendering_unittest_mac.mm +++ b/tests/unittests/os_rendering_unittest_mac.mm @@ -4,7 +4,7 @@ #import -#include "os_rendering_unittest_mac.h" +#include "tests/unittests/os_rendering_unittest_mac.h" namespace osr_unittests { diff --git a/tests/unittests/parser_unittest.cc b/tests/unittests/parser_unittest.cc index 16825add..aa39ef3a 100644 --- a/tests/unittests/parser_unittest.cc +++ b/tests/unittests/parser_unittest.cc @@ -3,7 +3,7 @@ // can be found in the LICENSE file. #include "include/cef_parser.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "tests/gtest/include/gtest/gtest.h" // Create the URL using the spec. TEST(ParserTest, CreateURLSpec) { diff --git a/tests/unittests/plugin_unittest.cc b/tests/unittests/plugin_unittest.cc index 7681cf59..4bb77048 100644 --- a/tests/unittests/plugin_unittest.cc +++ b/tests/unittests/plugin_unittest.cc @@ -7,10 +7,10 @@ #include "include/cef_resource_bundle.h" #include "include/wrapper/cef_closure_task.h" #include "include/wrapper/cef_stream_resource_handler.h" -#include "tests/cefclient/browser/client_app_browser.h" -#include "tests/cefclient/browser/resource_util.h" +#include "tests/gtest/include/gtest/gtest.h" +#include "tests/shared/browser/client_app_browser.h" +#include "tests/shared/browser/resource_util.h" #include "tests/unittests/routing_test_handler.h" -#include "testing/gtest/include/gtest/gtest.h" namespace { @@ -483,7 +483,7 @@ class PluginTestHandler : public RoutingTestHandler, } void OnContextMenuDismissed(CefRefPtr browser, - CefRefPtr frame) { + CefRefPtr frame) override { EXPECT_FALSE(got_context_menu_dismissed_); got_context_menu_dismissed_.yes(); diff --git a/tests/unittests/preference_unittest.cc b/tests/unittests/preference_unittest.cc index 62806227..c942cac9 100644 --- a/tests/unittests/preference_unittest.cc +++ b/tests/unittests/preference_unittest.cc @@ -5,10 +5,10 @@ #include "include/base/cef_bind.h" #include "include/cef_waitable_event.h" #include "include/wrapper/cef_closure_task.h" -#include "tests/cefclient/browser/client_app_browser.h" +#include "tests/shared/browser/client_app_browser.h" #include "tests/unittests/test_handler.h" #include "tests/unittests/test_util.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "tests/gtest/include/gtest/gtest.h" namespace { diff --git a/tests/unittests/print_unittest.cc b/tests/unittests/print_unittest.cc index 8f0cb65a..87a571d8 100644 --- a/tests/unittests/print_unittest.cc +++ b/tests/unittests/print_unittest.cc @@ -5,7 +5,7 @@ #include #include "include/cef_print_settings.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "tests/gtest/include/gtest/gtest.h" namespace { diff --git a/tests/unittests/process_message_unittest.cc b/tests/unittests/process_message_unittest.cc index cfb60f6f..95260f2c 100644 --- a/tests/unittests/process_message_unittest.cc +++ b/tests/unittests/process_message_unittest.cc @@ -4,8 +4,8 @@ #include "include/cef_process_message.h" #include "include/cef_task.h" -#include "testing/gtest/include/gtest/gtest.h" -#include "tests/cefclient/renderer/client_app_renderer.h" +#include "tests/gtest/include/gtest/gtest.h" +#include "tests/shared/renderer/client_app_renderer.h" #include "tests/unittests/test_handler.h" #include "tests/unittests/test_util.h" diff --git a/tests/unittests/request_context_unittest.cc b/tests/unittests/request_context_unittest.cc index a7bf1b58..2aa51a19 100644 --- a/tests/unittests/request_context_unittest.cc +++ b/tests/unittests/request_context_unittest.cc @@ -7,7 +7,7 @@ #include "include/cef_request_context_handler.h" #include "include/wrapper/cef_closure_task.h" #include "include/wrapper/cef_scoped_temp_dir.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "tests/gtest/include/gtest/gtest.h" #include "tests/unittests/test_handler.h" TEST(RequestContextTest, GetGlobalContext) { diff --git a/tests/unittests/request_handler_unittest.cc b/tests/unittests/request_handler_unittest.cc index d9b5734b..17108ca7 100644 --- a/tests/unittests/request_handler_unittest.cc +++ b/tests/unittests/request_handler_unittest.cc @@ -8,12 +8,13 @@ #include #include "include/base/cef_bind.h" +#include "include/base/cef_scoped_ptr.h" #include "include/cef_cookie.h" #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/browser/client_app_browser.h" -#include "tests/cefclient/renderer/client_app_renderer.h" +#include "tests/gtest/include/gtest/gtest.h" +#include "tests/shared/browser/client_app_browser.h" +#include "tests/shared/renderer/client_app_renderer.h" #include "tests/unittests/test_handler.h" #include "tests/unittests/test_util.h" @@ -984,7 +985,7 @@ class ResourceResponseTest : public TestHandler { int browser_id_; uint64 main_request_id_; uint64 sub_request_id_; - std::unique_ptr resource_test_; + scoped_ptr resource_test_; IMPLEMENT_REFCOUNTING(ResourceResponseTest); }; @@ -1360,7 +1361,7 @@ const char kReplaceString[] = "This is the replaced string!"; // Replace all instances of |kFindString| with |kReplaceString|. // This implementation is similar to the example in -// tests/cefclient/response_filter_test.cc. +// tests/shared/response_filter_test.cc. class ResponseFilterNeedMore : public ResponseFilterTestBase { public: ResponseFilterNeedMore() diff --git a/tests/unittests/request_unittest.cc b/tests/unittests/request_unittest.cc index cd33d01a..1cebd4fa 100644 --- a/tests/unittests/request_unittest.cc +++ b/tests/unittests/request_unittest.cc @@ -7,8 +7,8 @@ #include "include/base/cef_bind.h" #include "include/cef_request.h" #include "include/wrapper/cef_closure_task.h" -#include "testing/gtest/include/gtest/gtest.h" -#include "tests/cefclient/renderer/client_app_renderer.h" +#include "tests/gtest/include/gtest/gtest.h" +#include "tests/shared/renderer/client_app_renderer.h" #include "tests/unittests/test_handler.h" #include "tests/unittests/test_util.h" diff --git a/tests/unittests/resource.h b/tests/unittests/resource.h new file mode 100644 index 00000000..28c5063e --- /dev/null +++ b/tests/unittests/resource.h @@ -0,0 +1,26 @@ +// Copyright (c) 2013 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. + +//{{NO_DEPENDENCIES}} +// Microsoft Visual C++ generated include file. +// Used by cefclient.rc +// +#define BINARY 256 +#define IDS_OSRTEST_HTML 1000 +#define IDS_PDF_HTML 1001 +#define IDS_PDF_PDF 1002 +#define IDS_WINDOW_ICON_1X_PNG 1003 +#define IDS_WINDOW_ICON_2X_PNG 1004 + +// Next default values for new objects +// +#ifdef APSTUDIO_INVOKED +#ifndef APSTUDIO_READONLY_SYMBOLS +#define _APS_NO_MFC 1 +#define _APS_NEXT_RESOURCE_VALUE 130 +#define _APS_NEXT_COMMAND_VALUE 32774 +#define _APS_NEXT_CONTROL_VALUE 1000 +#define _APS_NEXT_SYMED_VALUE 111 +#endif +#endif diff --git a/tests/unittests/resource_manager_unittest.cc b/tests/unittests/resource_manager_unittest.cc index fbd2f5de..cb81bc4d 100644 --- a/tests/unittests/resource_manager_unittest.cc +++ b/tests/unittests/resource_manager_unittest.cc @@ -10,7 +10,7 @@ #include "include/wrapper/cef_resource_manager.h" #include "include/wrapper/cef_scoped_temp_dir.h" #include "include/wrapper/cef_stream_resource_handler.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "tests/gtest/include/gtest/gtest.h" #include "tests/unittests/file_util.h" #include "tests/unittests/routing_test_handler.h" @@ -975,7 +975,7 @@ TEST(ResourceManagerTest, ManyRequests) { // Requests should complete in order due to the delay. for (size_t i = 0; i < state.messages_.size(); ++i) { - std::stringstream ss; + ss.str(""); ss << kBaseUrl << (i * 10); EXPECT_EQ(ss.str(), state.messages_[i]); } diff --git a/tests/unittests/resource_util_linux.cc b/tests/unittests/resource_util_linux.cc new file mode 100644 index 00000000..e43a4adb --- /dev/null +++ b/tests/unittests/resource_util_linux.cc @@ -0,0 +1,36 @@ +// Copyright (c) 2013 The Chromium Embedded Framework Authors. +// Portions copyright (c) 2011 The Chromium 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 "tests/shared/browser/resource_util.h" + +#include +#include +#include + +namespace client { + +bool GetResourceDir(std::string& dir) { + char buff[1024]; + + // Retrieve the executable path. + ssize_t len = readlink("/proc/self/exe", buff, sizeof(buff)-1); + if (len == -1) + return false; + + buff[len] = 0; + + // Remove the executable name from the path. + char* pos = strrchr(buff, '/'); + if (!pos) + return false; + + // Add "unittests_files" to the path. + strcpy(pos+1, "unittests_files"); // NOLINT(runtime/printf) + dir = std::string(buff); + return true; +} + +} // namespace client + diff --git a/tests/unittests/resource_util_win_idmap.cc b/tests/unittests/resource_util_win_idmap.cc new file mode 100644 index 00000000..d888612b --- /dev/null +++ b/tests/unittests/resource_util_win_idmap.cc @@ -0,0 +1,32 @@ +// Copyright (c) 2013 The Chromium Embedded Framework Authors. All rights +// reserved. Use of this source code is governed by a BSD-style license that +// can be found in the LICENSE file. + +#include + +#include "tests/unittests/resource.h" + +namespace client { + +int GetResourceId(const char* resource_name) { + // Map of resource labels to BINARY id values. + static struct _resource_map { + char* name; + int id; + } resource_map[] = { + {"osr_test.html", IDS_OSRTEST_HTML}, + {"pdf.html", IDS_PDF_HTML}, + {"pdf.pdf", IDS_PDF_PDF}, + {"window_icon.1x.png", IDS_WINDOW_ICON_1X_PNG}, + {"window_icon.2x.png", IDS_WINDOW_ICON_2X_PNG}, + }; + + for (int i = 0; i < sizeof(resource_map)/sizeof(_resource_map); ++i) { + if (!strcmp(resource_map[i].name, resource_name)) + return resource_map[i].id; + } + + return 0; +} + +} // namespace client diff --git a/tests/unittests/mac/English.lproj/InfoPlist.strings b/tests/unittests/resources/mac/English.lproj/InfoPlist.strings similarity index 100% rename from tests/unittests/mac/English.lproj/InfoPlist.strings rename to tests/unittests/resources/mac/English.lproj/InfoPlist.strings diff --git a/tests/unittests/mac/English.lproj/MainMenu.xib b/tests/unittests/resources/mac/English.lproj/MainMenu.xib similarity index 100% rename from tests/unittests/mac/English.lproj/MainMenu.xib rename to tests/unittests/resources/mac/English.lproj/MainMenu.xib diff --git a/tests/unittests/mac/Info.plist b/tests/unittests/resources/mac/Info.plist similarity index 100% rename from tests/unittests/mac/Info.plist rename to tests/unittests/resources/mac/Info.plist diff --git a/tests/unittests/resources/mac/helper-Info.plist b/tests/unittests/resources/mac/helper-Info.plist new file mode 100644 index 00000000..727f4ff7 --- /dev/null +++ b/tests/unittests/resources/mac/helper-Info.plist @@ -0,0 +1,30 @@ + + + + + CFBundleDevelopmentRegion + en + CFBundleDisplayName + ${EXECUTABLE_NAME} + CFBundleExecutable + ${EXECUTABLE_NAME} + CFBundleIdentifier + org.cef.unittests.helper + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + ${PRODUCT_NAME} + CFBundlePackageType + APPL + CFBundleSignature + ???? + LSFileQuarantineEnabled + + LSMinimumSystemVersion + 10.9.0 + LSUIElement + 1 + NSSupportsAutomaticGraphicsSwitching + + + diff --git a/tests/unittests/mac/unittests.icns b/tests/unittests/resources/mac/unittests.icns similarity index 100% rename from tests/unittests/mac/unittests.icns rename to tests/unittests/resources/mac/unittests.icns diff --git a/tests/unittests/resources/win/cef_unittests.exe.manifest b/tests/unittests/resources/win/cef_unittests.exe.manifest new file mode 100644 index 00000000..d36f084b --- /dev/null +++ b/tests/unittests/resources/win/cef_unittests.exe.manifest @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/tests/unittests/resources/win/small.ico b/tests/unittests/resources/win/small.ico new file mode 100644 index 00000000..d551aa3a Binary files /dev/null and b/tests/unittests/resources/win/small.ico differ diff --git a/tests/unittests/resources/win/unittests.ico b/tests/unittests/resources/win/unittests.ico new file mode 100644 index 00000000..d551aa3a Binary files /dev/null and b/tests/unittests/resources/win/unittests.ico differ diff --git a/tests/unittests/resources/win/unittests.rc b/tests/unittests/resources/win/unittests.rc new file mode 100644 index 00000000..2a7d1bf3 --- /dev/null +++ b/tests/unittests/resources/win/unittests.rc @@ -0,0 +1,126 @@ +// Microsoft Visual C++ generated resource script. +// +#include "tests/unittests/resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#define APSTUDIO_HIDDEN_SYMBOLS +#include "windows.h" +#include "include/cef_version.h" +#undef APSTUDIO_HIDDEN_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (U.S.) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#pragma code_page(1252) +#endif //_WIN32 + +///////////////////////////////////////////////////////////////////////////// +// +// Binary +// + +IDS_OSRTEST_HTML BINARY "..\\..\\..\\shared\\resources\\osr_test.html" +IDS_PDF_HTML BINARY "..\\..\\..\\shared\\resources\\pdf.html" +IDS_PDF_PDF BINARY "..\\..\\..\\shared\\resources\\pdf.pdf" +IDS_WINDOW_ICON_1X_PNG BINARY "..\\..\\..\\shared\\resources\\window_icon.1x.png" +IDS_WINDOW_ICON_2X_PNG BINARY "..\\..\\..\\shared\\resources\\window_icon.2x.png" + +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +ICI_UNITTESTS ICON "unittests.ico" +IDI_SMALL ICON "small.ico" + +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +VS_VERSION_INFO VERSIONINFO + FILEVERSION CEF_VERSION_MAJOR,CHROME_VERSION_BUILD,CEF_COMMIT_NUMBER,0 + PRODUCTVERSION CEF_VERSION_MAJOR,CHROME_VERSION_BUILD,CEF_COMMIT_NUMBER,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) Unit Test Application" + VALUE "FileVersion", CEF_VERSION + VALUE "InternalName", "cef_unittests" + VALUE "LegalCopyright", "Copyright (C) " MAKE_STRING(COPYRIGHT_YEAR) " The Chromium Embedded Framework Authors" + VALUE "OriginalFilename", "cef_unittests.exe" + VALUE "ProductName", "Chromium Embedded Framework (CEF) Unit Test Application" + VALUE "ProductVersion", CEF_VERSION + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE +BEGIN + "#define APSTUDIO_HIDDEN_SYMBOLS\r\n" + "#include ""windows.h""\r\n" + "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n" + "\0" +END + +3 TEXTINCLUDE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + +#endif // English (U.S.) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + diff --git a/tests/unittests/routing_test_handler.cc b/tests/unittests/routing_test_handler.cc index 78ce1905..111b772b 100644 --- a/tests/unittests/routing_test_handler.cc +++ b/tests/unittests/routing_test_handler.cc @@ -3,7 +3,7 @@ // can be found in the LICENSE file. #include "tests/unittests/routing_test_handler.h" -#include "tests/cefclient/renderer/client_app_renderer.h" +#include "tests/shared/renderer/client_app_renderer.h" using client::ClientAppRenderer; diff --git a/tests/unittests/run_all_unittests.cc b/tests/unittests/run_all_unittests.cc index c9c01353..b23be979 100644 --- a/tests/unittests/run_all_unittests.cc +++ b/tests/unittests/run_all_unittests.cc @@ -21,11 +21,11 @@ #include "include/cef_thread.h" #include "include/wrapper/cef_helpers.h" #include "include/wrapper/cef_closure_task.h" -#include "tests/cefclient/browser/client_app_browser.h" -#include "tests/cefclient/browser/main_message_loop_external_pump.h" -#include "tests/cefclient/browser/main_message_loop_std.h" -#include "tests/cefclient/common/client_app_other.h" -#include "tests/cefclient/renderer/client_app_renderer.h" +#include "tests/shared/browser/client_app_browser.h" +#include "tests/shared/browser/main_message_loop_external_pump.h" +#include "tests/shared/browser/main_message_loop_std.h" +#include "tests/shared/common/client_app_other.h" +#include "tests/shared/renderer/client_app_renderer.h" #include "tests/unittests/test_handler.h" #include "tests/unittests/test_suite.h" @@ -122,6 +122,7 @@ int main(int argc, char* argv[]) { client::ClientApp::GetProcessType(test_suite.command_line()); if (process_type == client::ClientApp::BrowserProcess) { app = new client::ClientAppBrowser(); +#if !defined(OS_MACOSX) } else if (process_type == client::ClientApp::RendererProcess || process_type == client::ClientApp::ZygoteProcess) { app = new client::ClientAppRenderer(); @@ -133,6 +134,12 @@ int main(int argc, char* argv[]) { int exit_code = CefExecuteProcess(main_args, app, windows_sandbox_info); if (exit_code >= 0) return exit_code; +#else + } else { + // On OS X this executable is only used for the main process. + NOTREACHED(); + } +#endif CefSettings settings; test_suite.GetSettings(settings); diff --git a/tests/unittests/scheme_handler_unittest.cc b/tests/unittests/scheme_handler_unittest.cc index 38fa952e..254d9d16 100644 --- a/tests/unittests/scheme_handler_unittest.cc +++ b/tests/unittests/scheme_handler_unittest.cc @@ -112,7 +112,7 @@ class TestSchemeHandler : public TestHandler { // Necessary to make the method public in order to destroy the test from // ClientSchemeHandler::ProcessRequest(). - void DestroyTest() { + void DestroyTest() override { TestHandler::DestroyTest(); } diff --git a/tests/unittests/scoped_temp_dir_unittest.cc b/tests/unittests/scoped_temp_dir_unittest.cc index b2ee6ae3..5728aff7 100644 --- a/tests/unittests/scoped_temp_dir_unittest.cc +++ b/tests/unittests/scoped_temp_dir_unittest.cc @@ -6,7 +6,7 @@ #include "include/cef_file_util.h" #include "include/wrapper/cef_scoped_temp_dir.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "tests/gtest/include/gtest/gtest.h" TEST(ScopedTempDir, FullPath) { CefString test_path; diff --git a/tests/unittests/stream_resource_handler_unittest.cc b/tests/unittests/stream_resource_handler_unittest.cc index 639ad62f..3543190d 100644 --- a/tests/unittests/stream_resource_handler_unittest.cc +++ b/tests/unittests/stream_resource_handler_unittest.cc @@ -10,7 +10,7 @@ #include "include/cef_stream.h" #include "include/wrapper/cef_closure_task.h" #include "include/wrapper/cef_stream_resource_handler.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "tests/gtest/include/gtest/gtest.h" #include "tests/unittests/routing_test_handler.h" namespace { diff --git a/tests/unittests/stream_unittest.cc b/tests/unittests/stream_unittest.cc index c23af141..98b01c91 100644 --- a/tests/unittests/stream_unittest.cc +++ b/tests/unittests/stream_unittest.cc @@ -5,7 +5,7 @@ #include #include "include/cef_stream.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "tests/gtest/include/gtest/gtest.h" static void VerifyStreamReadBehavior(CefRefPtr stream, const std::string& contents) { diff --git a/tests/unittests/string_unittest.cc b/tests/unittests/string_unittest.cc index 8436b012..f65f7a46 100644 --- a/tests/unittests/string_unittest.cc +++ b/tests/unittests/string_unittest.cc @@ -10,7 +10,7 @@ #include "include/internal/cef_string_list.h" #include "include/internal/cef_string_map.h" #include "include/internal/cef_string_multimap.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "tests/gtest/include/gtest/gtest.h" // Test UTF8 strings. TEST(StringTest, UTF8) { diff --git a/tests/unittests/task_unittest.cc b/tests/unittests/task_unittest.cc index e076e621..31649e2b 100644 --- a/tests/unittests/task_unittest.cc +++ b/tests/unittests/task_unittest.cc @@ -5,7 +5,7 @@ #include "include/base/cef_bind.h" #include "include/cef_task.h" #include "include/wrapper/cef_closure_task.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "tests/gtest/include/gtest/gtest.h" #include "tests/unittests/test_handler.h" namespace { diff --git a/tests/unittests/test_handler.cc b/tests/unittests/test_handler.cc index 944b843d..27cef83d 100644 --- a/tests/unittests/test_handler.cc +++ b/tests/unittests/test_handler.cc @@ -9,7 +9,7 @@ #include "include/cef_stream.h" #include "include/wrapper/cef_closure_task.h" #include "include/wrapper/cef_stream_resource_handler.h" -#include "tests/cefclient/common/client_switches.h" +#include "tests/shared/common/client_switches.h" #if defined(USE_AURA) #include "include/views/cef_browser_view.h" diff --git a/tests/unittests/test_handler.h b/tests/unittests/test_handler.h index 8882b4d9..5b579dc0 100644 --- a/tests/unittests/test_handler.h +++ b/tests/unittests/test_handler.h @@ -12,15 +12,15 @@ #include #include "include/base/cef_bind.h" +#include "include/base/cef_scoped_ptr.h" #include "include/cef_browser.h" #include "include/cef_client.h" #include "include/cef_frame.h" #include "include/cef_task.h" #include "include/cef_waitable_event.h" +#include "tests/gtest/include/gtest/gtest.h" #include "tests/unittests/thread_helper.h" -#include "testing/gtest/include/gtest/gtest.h" - class TrackCallback { public: TrackCallback(): gotit_(false) {} @@ -318,7 +318,7 @@ class TestHandler : public CefClient, bool destroy_test_expected_; bool destroy_test_called_; - std::unique_ptr ui_thread_helper_; + scoped_ptr ui_thread_helper_; // Used to track the number of currently existing browser windows. static int browser_count_; diff --git a/tests/unittests/test_suite.cc b/tests/unittests/test_suite.cc index baab2d8d..d7763527 100644 --- a/tests/unittests/test_suite.cc +++ b/tests/unittests/test_suite.cc @@ -4,9 +4,8 @@ #include "tests/unittests/test_suite.h" -#include "tests/cefclient/common/client_switches.h" - -#include "testing/gtest/include/gtest/gtest.h" +#include "tests/gtest/include/gtest/gtest.h" +#include "tests/shared/common/client_switches.h" namespace { diff --git a/tests/unittests/test_util.cc b/tests/unittests/test_util.cc index db31cc1f..cd8f11cd 100644 --- a/tests/unittests/test_util.cc +++ b/tests/unittests/test_util.cc @@ -3,7 +3,7 @@ // can be found in the LICENSE file. #include "tests/unittests/test_util.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "tests/gtest/include/gtest/gtest.h" void TestMapEqual(const CefRequest::HeaderMap& map1, const CefRequest::HeaderMap& map2, diff --git a/tests/unittests/thread_unittest.cc b/tests/unittests/thread_unittest.cc index 77909516..c25330ed 100644 --- a/tests/unittests/thread_unittest.cc +++ b/tests/unittests/thread_unittest.cc @@ -6,9 +6,9 @@ #include "include/cef_task.h" #include "include/cef_thread.h" #include "include/wrapper/cef_closure_task.h" -#include "testing/gtest/include/gtest/gtest.h" -#include "tests/cefclient/browser/client_app_browser.h" -#include "tests/cefclient/renderer/client_app_renderer.h" +#include "tests/gtest/include/gtest/gtest.h" +#include "tests/shared/browser/client_app_browser.h" +#include "tests/shared/renderer/client_app_renderer.h" #include "tests/unittests/test_handler.h" using client::ClientAppBrowser; diff --git a/tests/unittests/tracing_unittest.cc b/tests/unittests/tracing_unittest.cc index 60a1572e..7a9d5430 100644 --- a/tests/unittests/tracing_unittest.cc +++ b/tests/unittests/tracing_unittest.cc @@ -8,7 +8,7 @@ #include "include/cef_trace.h" #include "include/cef_waitable_event.h" #include "include/wrapper/cef_closure_task.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "tests/gtest/include/gtest/gtest.h" #include "tests/unittests/file_util.h" #include "tests/unittests/test_handler.h" diff --git a/tests/unittests/translator_unittest.cc b/tests/unittests/translator_unittest.cc index 4481c0d1..289c9f6c 100644 --- a/tests/unittests/translator_unittest.cc +++ b/tests/unittests/translator_unittest.cc @@ -3,7 +3,7 @@ // can be found in the LICENSE file. #include "include/test/cef_translator_test.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "tests/gtest/include/gtest/gtest.h" // Test getting/setting primitive types. TEST(TranslatorTest, Primitive) { diff --git a/tests/unittests/urlrequest_unittest.cc b/tests/unittests/urlrequest_unittest.cc index 6fbce585..ef0dbece 100644 --- a/tests/unittests/urlrequest_unittest.cc +++ b/tests/unittests/urlrequest_unittest.cc @@ -12,8 +12,8 @@ #include "include/cef_waitable_event.h" #include "include/wrapper/cef_closure_task.h" #include "include/wrapper/cef_scoped_temp_dir.h" -#include "testing/gtest/include/gtest/gtest.h" -#include "tests/cefclient/renderer/client_app_renderer.h" +#include "tests/gtest/include/gtest/gtest.h" +#include "tests/shared/renderer/client_app_renderer.h" #include "tests/unittests/file_util.h" #include "tests/unittests/test_handler.h" #include "tests/unittests/test_suite.h" diff --git a/tests/unittests/v8_unittest.cc b/tests/unittests/v8_unittest.cc index d1d55310..0ad8b4e0 100644 --- a/tests/unittests/v8_unittest.cc +++ b/tests/unittests/v8_unittest.cc @@ -8,9 +8,9 @@ #include "include/cef_task.h" #include "include/cef_v8.h" #include "include/wrapper/cef_closure_task.h" -#include "tests/cefclient/browser/client_app_browser.h" -#include "tests/cefclient/renderer/client_app_renderer.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "tests/gtest/include/gtest/gtest.h" +#include "tests/shared/browser/client_app_browser.h" +#include "tests/shared/renderer/client_app_renderer.h" #include "tests/unittests/test_handler.h" using client::ClientAppBrowser; diff --git a/tests/unittests/values_unittest.cc b/tests/unittests/values_unittest.cc index 2ea4e581..a25c47db 100644 --- a/tests/unittests/values_unittest.cc +++ b/tests/unittests/values_unittest.cc @@ -4,7 +4,7 @@ #include "include/cef_task.h" #include "include/cef_values.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "tests/gtest/include/gtest/gtest.h" #include "tests/unittests/test_handler.h" #include "tests/unittests/test_util.h" @@ -802,7 +802,7 @@ TEST(ValuesTest, ValueSimple) { EXPECT_TRUE(value->SetBool(true)); EXPECT_EQ(VTYPE_BOOL, value->GetType()); - EXPECT_EQ(true, value->GetBool()); + EXPECT_TRUE(value->GetBool()); EXPECT_TRUE(value->IsValid()); EXPECT_FALSE(value->IsReadOnly()); EXPECT_FALSE(value->IsOwned()); @@ -810,7 +810,7 @@ TEST(ValuesTest, ValueSimple) { EXPECT_TRUE(value->SetBool(false)); EXPECT_EQ(VTYPE_BOOL, value->GetType()); - EXPECT_EQ(false, value->GetBool()); + EXPECT_FALSE(value->GetBool()); EXPECT_TRUE(value->IsValid()); EXPECT_FALSE(value->IsReadOnly()); EXPECT_FALSE(value->IsOwned()); diff --git a/tests/unittests/version_unittest.cc b/tests/unittests/version_unittest.cc index 958b2363..9e0f6360 100644 --- a/tests/unittests/version_unittest.cc +++ b/tests/unittests/version_unittest.cc @@ -3,7 +3,7 @@ // can be found in the LICENSE file. #include "include/cef_version.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "tests/gtest/include/gtest/gtest.h" TEST(VersionTest, VersionInfo) { EXPECT_EQ(CEF_VERSION_MAJOR, cef_version_info(0)); diff --git a/tests/unittests/views/button_unittest.cc b/tests/unittests/views/button_unittest.cc index 2966e429..0a38fbdd 100644 --- a/tests/unittests/views/button_unittest.cc +++ b/tests/unittests/views/button_unittest.cc @@ -13,7 +13,7 @@ #include "tests/unittests/thread_helper.h" #include "tests/unittests/views/test_window_delegate.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "tests/gtest/include/gtest/gtest.h" #define BUTTON_TEST(name) UI_THREAD_TEST(ViewsButtonTest, name) #define BUTTON_TEST_ASYNC(name) UI_THREAD_TEST_ASYNC(ViewsButtonTest, name) diff --git a/tests/unittests/views/panel_unittest.cc b/tests/unittests/views/panel_unittest.cc index 231eb607..0e593bdb 100644 --- a/tests/unittests/views/panel_unittest.cc +++ b/tests/unittests/views/panel_unittest.cc @@ -10,7 +10,7 @@ #include "include/views/cef_window.h" #include "tests/unittests/thread_helper.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "tests/gtest/include/gtest/gtest.h" #define PANEL_TEST(name) UI_THREAD_TEST(ViewsPanelTest, name) diff --git a/tests/unittests/views/scroll_view_unittest.cc b/tests/unittests/views/scroll_view_unittest.cc index 789e73dc..68df588a 100644 --- a/tests/unittests/views/scroll_view_unittest.cc +++ b/tests/unittests/views/scroll_view_unittest.cc @@ -11,7 +11,7 @@ #include "tests/unittests/thread_helper.h" #include "tests/unittests/views/test_window_delegate.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "tests/gtest/include/gtest/gtest.h" #define SCROLL_VIEW_TEST_ASYNC(name) \ UI_THREAD_TEST_ASYNC(ViewsScrollViewTest, name) diff --git a/tests/unittests/views/test_window_delegate.cc b/tests/unittests/views/test_window_delegate.cc index ac2697df..73c24345 100644 --- a/tests/unittests/views/test_window_delegate.cc +++ b/tests/unittests/views/test_window_delegate.cc @@ -10,7 +10,7 @@ #include "include/wrapper/cef_closure_task.h" #include "tests/unittests/thread_helper.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "tests/gtest/include/gtest/gtest.h" namespace { diff --git a/tests/unittests/views/textfield_unittest.cc b/tests/unittests/views/textfield_unittest.cc index 891c37f4..2a3060df 100644 --- a/tests/unittests/views/textfield_unittest.cc +++ b/tests/unittests/views/textfield_unittest.cc @@ -10,7 +10,7 @@ #include "tests/unittests/thread_helper.h" #include "tests/unittests/views/test_window_delegate.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "tests/gtest/include/gtest/gtest.h" // See ui/events/keycodes/keyboard_codes.h #define VKEY_UNKNOWN 0 diff --git a/tests/unittests/views/window_unittest.cc b/tests/unittests/views/window_unittest.cc index e6207c3a..68218c80 100644 --- a/tests/unittests/views/window_unittest.cc +++ b/tests/unittests/views/window_unittest.cc @@ -11,7 +11,7 @@ #include "tests/unittests/thread_helper.h" #include "tests/unittests/views/test_window_delegate.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "tests/gtest/include/gtest/gtest.h" #define WINDOW_TEST_ASYNC(name) UI_THREAD_TEST_ASYNC(ViewsWindowTest, name) diff --git a/tests/unittests/waitable_event_unittest.cc b/tests/unittests/waitable_event_unittest.cc index 9373febe..8ba6c8d7 100644 --- a/tests/unittests/waitable_event_unittest.cc +++ b/tests/unittests/waitable_event_unittest.cc @@ -6,7 +6,7 @@ #include "include/cef_thread.h" #include "include/cef_waitable_event.h" #include "include/wrapper/cef_closure_task.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "tests/gtest/include/gtest/gtest.h" // Test manual reset. TEST(WaitableEventTest, ManualReset) { diff --git a/tests/unittests/webui_unittest.cc b/tests/unittests/webui_unittest.cc index d118c91c..f9941e94 100644 --- a/tests/unittests/webui_unittest.cc +++ b/tests/unittests/webui_unittest.cc @@ -6,7 +6,7 @@ #include "include/cef_callback.h" #include "include/cef_parser.h" #include "include/wrapper/cef_closure_task.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "tests/gtest/include/gtest/gtest.h" #include "tests/unittests/test_handler.h" namespace { diff --git a/tests/unittests/xml_reader_unittest.cc b/tests/unittests/xml_reader_unittest.cc index fcc85600..43bbc0da 100644 --- a/tests/unittests/xml_reader_unittest.cc +++ b/tests/unittests/xml_reader_unittest.cc @@ -5,7 +5,7 @@ #include "include/cef_stream.h" #include "include/cef_xml_reader.h" #include "include/wrapper/cef_xml_object.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "tests/gtest/include/gtest/gtest.h" namespace { diff --git a/tests/unittests/zip_reader_unittest.cc b/tests/unittests/zip_reader_unittest.cc index 3ecb789e..fd7d5731 100644 --- a/tests/unittests/zip_reader_unittest.cc +++ b/tests/unittests/zip_reader_unittest.cc @@ -5,7 +5,7 @@ #include "include/cef_stream.h" #include "include/cef_zip_reader.h" #include "include/wrapper/cef_zip_archive.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "tests/gtest/include/gtest/gtest.h" namespace { diff --git a/tools/distrib/linux/README.standard.txt b/tools/distrib/linux/README.standard.txt index e00f3eae..ce9a7ae5 100644 --- a/tools/distrib/linux/README.standard.txt +++ b/tools/distrib/linux/README.standard.txt @@ -1,14 +1,6 @@ CONTENTS -------- -cefclient Contains the cefclient sample application configured to build - using the files in this distribution. This application demonstrates - a wide range of CEF functionalities. - -cefsimple Contains the cefsimple sample application configured to build - using the files in this distribution. This application demonstrates - the minimal functionality required to create a browser window. - cmake Contains CMake configuration files shared by all targets. Debug Contains libcef.so and other components required to run the debug @@ -30,6 +22,23 @@ Resources Contains resources required by libcef.so. By default these files should be placed in the same directory as libcef.so and will be copied there as part of the build process. +tests/ Directory of tests that demonstrate CEF usage. + + cefclient Contains the cefclient sample application configured to build + using the files in this distribution. This application demonstrates + a wide range of CEF functionalities. + + cefsimple Contains the cefsimple sample application configured to build + using the files in this distribution. This application demonstrates + the minimal functionality required to create a browser window. + + gtest Contains the Google C++ Testing Framework used by the unittests + target. + + shared Contains source code shared by the cefclient and unittests targets. + + unittests Contains unit tests that exercise the CEF APIs. + USAGE ----- diff --git a/tools/distrib/mac/README.standard.txt b/tools/distrib/mac/README.standard.txt index 6dff8f56..6d8fb716 100644 --- a/tools/distrib/mac/README.standard.txt +++ b/tools/distrib/mac/README.standard.txt @@ -1,14 +1,6 @@ CONTENTS -------- -cefclient Contains the cefclient sample application configured to build - using the files in this distribution. This application demonstrates - a wide range of CEF functionalities. - -cefsimple Contains the cefsimple sample application configured to build - using the files in this distribution. This application demonstrates - the minimal functionality required to create a browser window. - cmake Contains CMake configuration files shared by all targets. Debug Contains the "Chromium Embedded Framework.framework" and other @@ -24,6 +16,23 @@ Release Contains the "Chromium Embedded Framework.framework" and other components required to run the release version of CEF-based applications. +tests/ Directory of tests that demonstrate CEF usage. + + cefclient Contains the cefclient sample application configured to build + using the files in this distribution. This application demonstrates + a wide range of CEF functionalities. + + cefsimple Contains the cefsimple sample application configured to build + using the files in this distribution. This application demonstrates + the minimal functionality required to create a browser window. + + gtest Contains the Google C++ Testing Framework used by the unittests + target. + + shared Contains source code shared by the cefclient and unittests targets. + + unittests Contains unit tests that exercise the CEF APIs. + USAGE ----- diff --git a/tools/distrib/win/README.standard.txt b/tools/distrib/win/README.standard.txt index fd7a8074..79d6f472 100644 --- a/tools/distrib/win/README.standard.txt +++ b/tools/distrib/win/README.standard.txt @@ -1,14 +1,6 @@ CONTENTS -------- -cefclient Contains the cefclient sample application configured to build - using the files in this distribution. This application demonstrates - a wide range of CEF functionalities. - -cefsimple Contains the cefsimple sample application configured to build - using the files in this distribution. This application demonstrates - the minimal functionality required to create a browser window. - cmake Contains CMake configuration files shared by all targets. Debug Contains libcef.dll, libcef.lib and other components required to @@ -30,6 +22,23 @@ Resources Contains resources required by libcef.dll. By default these files should be placed in the same directory as libcef.dll and will be copied there as part of the build process. +tests/ Directory of tests that demonstrate CEF usage. + + cefclient Contains the cefclient sample application configured to build + using the files in this distribution. This application demonstrates + a wide range of CEF functionalities. + + cefsimple Contains the cefsimple sample application configured to build + using the files in this distribution. This application demonstrates + the minimal functionality required to create a browser window. + + gtest Contains the Google C++ Testing Framework used by the unittests + target. + + shared Contains source code shared by the cefclient and unittests targets. + + unittests Contains unit tests that exercise the CEF APIs. + USAGE ----- diff --git a/tools/distrib/win/transfer_standard.cfg b/tools/distrib/win/transfer_standard.cfg index f798c24c..6047d987 100644 --- a/tools/distrib/win/transfer_standard.cfg +++ b/tools/distrib/win/transfer_standard.cfg @@ -12,10 +12,14 @@ [ { 'source' : '../build/win/compatibility.manifest', - 'target' : 'cefclient/resources/win/compatibility.manifest', + 'target' : 'tests/cefclient/resources/win/compatibility.manifest', }, { 'source' : '../build/win/compatibility.manifest', - 'target' : 'cefsimple/compatibility.manifest', + 'target' : 'tests/cefsimple/compatibility.manifest', + }, + { + 'source' : '../build/win/compatibility.manifest', + 'target' : 'tests/unittests/resources/win/compatibility.manifest', }, ] diff --git a/tools/make_capi_header.py b/tools/make_capi_header.py index b8b022f2..8434df2e 100644 --- a/tools/make_capi_header.py +++ b/tools/make_capi_header.py @@ -87,6 +87,17 @@ def make_capi_header(header, filename): #pragma once """ + + # Protect against incorrect use of test headers. + if filename.startswith('test/'): + result += \ +"""#if !defined(BUILDING_CEF_SHARED) && !defined(WRAPPING_CEF_SHARED) && \\ + !defined(UNIT_TEST) +#error This file can be included for unit tests only +#endif + +""" + classes = header.get_classes(filename) # identify all includes and forward declarations diff --git a/tools/make_cmake.py b/tools/make_cmake.py index 3357e6f5..c7125588 100644 --- a/tools/make_cmake.py +++ b/tools/make_cmake.py @@ -33,13 +33,6 @@ def get_files_for_variable(cmake_path, variables, variable): new_paths = [] paths = variables[variable] for path in paths: - if path[0] == '<': - # Skip gyp include variables - continue - if path.find('/test/') >= 0: - # Skip test files - continue - abspath = os.path.join(cef_dir, path) newpath = normalize_path(os.path.relpath(abspath, cmake_dirname)) new_paths.append(newpath) diff --git a/tools/make_cpptoc_header.py b/tools/make_cpptoc_header.py index 91dec988..1e68b801 100644 --- a/tools/make_cpptoc_header.py +++ b/tools/make_cpptoc_header.py @@ -28,15 +28,15 @@ def make_cpptoc_header(header, clsname): if dllside: result += """ -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif """ else: result += """ -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif """ # include the headers for this class @@ -67,11 +67,6 @@ def make_cpptoc_header(header, clsname): ' '+clsname+'CppToC();\n'+ \ '};\n\n' - if dllside: - result += '#endif // BUILDING_CEF_SHARED\n' - else: - result += '#endif // USING_CEF_SHARED\n' - result += '#endif // CEF_LIBCEF_DLL_CPPTOC_'+defname+'_CPPTOC_H_' return wrap_code(result) diff --git a/tools/make_ctocpp_header.py b/tools/make_ctocpp_header.py index b80987a1..bf68ddbc 100644 --- a/tools/make_ctocpp_header.py +++ b/tools/make_ctocpp_header.py @@ -60,15 +60,15 @@ def make_ctocpp_header(header, clsname): if clientside: result += """ -#ifndef BUILDING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed DLL-side only") -#else // BUILDING_CEF_SHARED +#if !defined(BUILDING_CEF_SHARED) +#error This file can be included DLL-side only +#endif """ else: result += """ -#ifndef USING_CEF_SHARED -#pragma message("Warning: "__FILE__" may be accessed wrapper-side only") -#else // USING_CEF_SHARED +#if !defined(WRAPPING_CEF_SHARED) +#error This file can be included wrapper-side only +#endif """ # build the function body @@ -110,11 +110,6 @@ def make_ctocpp_header(header, clsname): result += func_body result += '};\n\n' - if clientside: - result += '#endif // BUILDING_CEF_SHARED\n' - else: - result += '#endif // USING_CEF_SHARED\n' - result += '#endif // CEF_LIBCEF_DLL_CTOCPP_'+defname+'_CTOCPP_H_' return wrap_code(result) diff --git a/tools/make_distrib.py b/tools/make_distrib.py index 6a3f06a2..f30e6627 100644 --- a/tools/make_distrib.py +++ b/tools/make_distrib.py @@ -148,15 +148,44 @@ def create_readme(): if not options.quiet: sys.stdout.write('Creating README.TXT file.\n') +def create_fuzed_gtest(tests_dir): + """ Generate a fuzed version of gtest and build the expected directory structure. """ + src_gtest_dir = os.path.join(src_dir, 'testing', 'gtest') + run('%s fuse_gtest_files.py \"%s\"' % (sys.executable, tests_dir), + os.path.join(src_gtest_dir, 'scripts')) + + if not options.quiet: + sys.stdout.write('Building gtest directory structure.\n') + + target_gtest_dir = os.path.join(tests_dir, 'gtest') + gtest_header = os.path.join(target_gtest_dir, 'gtest.h') + gtest_cpp = os.path.join(target_gtest_dir, 'gtest-all.cc') + + if not os.path.exists(gtest_header): + raise Exception('Generated file not found: %s' % gtest_header) + if not os.path.exists(gtest_cpp): + raise Exception('Generated file not found: %s' % gtest_cpp) + + # gtest header file at tests/gtest/include/gtest/gtest.h + target_gtest_header_dir = os.path.join(target_gtest_dir, 'include', 'gtest') + make_dir(target_gtest_header_dir, options.quiet) + move_file(gtest_header, target_gtest_header_dir, options.quiet) + + # gtest source file at tests/gtest/src/gtest-all.cc + target_gtest_cpp_dir = os.path.join(target_gtest_dir, 'src') + make_dir(target_gtest_cpp_dir, options.quiet) + move_file(gtest_cpp, target_gtest_cpp_dir, options.quiet) + + # gtest LICENSE file at tests/gtest/LICENSE + copy_file(os.path.join(src_gtest_dir, 'LICENSE'), target_gtest_dir, options.quiet) + + # CEF README file at tests/gtest/README.cef + copy_file(os.path.join(cef_dir, 'tests', 'gtest', 'README.cef.in'), + os.path.join(target_gtest_dir, 'README.cef'), options.quiet) + def transfer_gypi_files(src_dir, gypi_paths, gypi_path_prefix, dst_dir, quiet): """ Transfer files from one location to another. """ for path in gypi_paths: - # skip gyp includes - if path[:2] == '<@': - continue - # skip test files - if path.find('/test/') >= 0: - continue src = os.path.join(src_dir, path) dst = os.path.join(dst_dir, path.replace(gypi_path_prefix, '')) dst_path = os.path.dirname(dst) @@ -469,14 +498,36 @@ if mode == 'standard' or mode == 'minimal': variables, options.quiet) if mode == 'standard': - # create the cefclient directory - cefclient_dir = os.path.join(output_dir, 'cefclient') + # create the tests directory + tests_dir = os.path.join(output_dir, 'tests') + make_dir(tests_dir, options.quiet) + + # create the tests/shared directory + shared_dir = os.path.join(tests_dir, 'shared') + make_dir(shared_dir, options.quiet) + + # create the tests/cefclient directory + cefclient_dir = os.path.join(tests_dir, 'cefclient') make_dir(cefclient_dir, options.quiet) - # create the cefsimple directory - cefsimple_dir = os.path.join(output_dir, 'cefsimple') + # create the tests/cefsimple directory + cefsimple_dir = os.path.join(tests_dir, 'cefsimple') make_dir(cefsimple_dir, options.quiet) + # create the tests/unittests directory + unittests_dir = os.path.join(tests_dir, 'unittests') + make_dir(unittests_dir, options.quiet) + + # transfer common shared files + transfer_gypi_files(cef_dir, cef_paths2['shared_sources_browser'], \ + 'tests/shared/', shared_dir, options.quiet) + transfer_gypi_files(cef_dir, cef_paths2['shared_sources_common'], \ + 'tests/shared/', shared_dir, options.quiet) + transfer_gypi_files(cef_dir, cef_paths2['shared_sources_renderer'], \ + 'tests/shared/', shared_dir, options.quiet) + transfer_gypi_files(cef_dir, cef_paths2['shared_sources_resources'], \ + 'tests/shared/', shared_dir, options.quiet) + # transfer common cefclient files transfer_gypi_files(cef_dir, cef_paths2['cefclient_sources_browser'], \ 'tests/cefclient/', cefclient_dir, options.quiet) @@ -491,6 +542,13 @@ if mode == 'standard': transfer_gypi_files(cef_dir, cef_paths2['cefsimple_sources_common'], \ 'tests/cefsimple/', cefsimple_dir, options.quiet) + # transfer common unittests files + transfer_gypi_files(cef_dir, cef_paths2['unittests_sources_common'], \ + 'tests/unittests/', unittests_dir, options.quiet) + + # create the fuzed gtest version + create_fuzed_gtest(tests_dir) + # process cmake templates process_cmake_template(os.path.join(cef_dir, 'tests', 'cefclient', 'CMakeLists.txt.in'), \ os.path.join(cefclient_dir, 'CMakeLists.txt'), \ @@ -498,15 +556,18 @@ if mode == 'standard': process_cmake_template(os.path.join(cef_dir, 'tests', 'cefsimple', 'CMakeLists.txt.in'), \ os.path.join(cefsimple_dir, 'CMakeLists.txt'), \ variables, options.quiet) + process_cmake_template(os.path.join(cef_dir, 'tests', 'gtest', 'CMakeLists.txt.in'), \ + os.path.join(tests_dir, 'gtest', 'CMakeLists.txt'), \ + variables, options.quiet) + process_cmake_template(os.path.join(cef_dir, 'tests', 'unittests', 'CMakeLists.txt.in'), \ + os.path.join(unittests_dir, 'CMakeLists.txt'), \ + variables, options.quiet) - # transfer gyp files - paths_gypi = os.path.join(cef_dir, 'cef_paths2.gypi') - data = read_file(paths_gypi) - data = data.replace('tests/cefclient/', 'cefclient/') - data = data.replace('tests/cefsimple/', 'cefsimple/') - write_file(os.path.join(output_dir, 'cef_paths2.gypi'), data) + # transfer gypi files copy_file(os.path.join(cef_dir, 'cef_paths.gypi'), \ os.path.join(output_dir, 'cef_paths.gypi'), options.quiet) + copy_file(os.path.join(cef_dir, 'cef_paths2.gypi'), \ + os.path.join(output_dir, 'cef_paths2.gypi'), options.quiet) if platform == 'windows': binaries = [ @@ -606,6 +667,10 @@ if platform == 'windows': mode, output_dir, options.quiet) if mode == 'standard': + # transfer shared files + transfer_gypi_files(cef_dir, cef_paths2['shared_sources_win'], \ + 'tests/shared/', shared_dir, options.quiet) + # transfer cefclient files transfer_gypi_files(cef_dir, cef_paths2['cefclient_sources_win'], \ 'tests/cefclient/', cefclient_dir, options.quiet) @@ -614,6 +679,12 @@ if platform == 'windows': transfer_gypi_files(cef_dir, cef_paths2['cefsimple_sources_win'], \ 'tests/cefsimple/', cefsimple_dir, options.quiet) + # transfer unittests files + transfer_gypi_files(cef_dir, cef_paths2['unittests_sources_win'], \ + 'tests/unittests/', unittests_dir, options.quiet) + transfer_gypi_files(cef_dir, cef_paths2['unittests_sources_views'], \ + 'tests/unittests/', unittests_dir, options.quiet) + if not options.nodocs: # generate doc files os.popen('make_cppdocs.bat '+cef_rev) @@ -683,17 +754,19 @@ elif platform == 'macosx': mode, output_dir, options.quiet) if mode == 'standard': + # transfer shared files + transfer_gypi_files(cef_dir, cef_paths2['shared_sources_mac'], \ + 'tests/shared/', shared_dir, options.quiet) + transfer_gypi_files(cef_dir, cef_paths2['shared_sources_mac_helper'], \ + 'tests/shared/', shared_dir, options.quiet) + # transfer cefclient files transfer_gypi_files(cef_dir, cef_paths2['cefclient_sources_mac'], \ 'tests/cefclient/', cefclient_dir, options.quiet) - transfer_gypi_files(cef_dir, cef_paths2['cefclient_sources_mac_helper'], \ - 'tests/cefclient/', cefclient_dir, options.quiet) - transfer_gypi_files(cef_dir, cef_paths2['cefclient_bundle_resources_mac'], \ - 'tests/cefclient/', cefclient_dir, options.quiet) # transfer cefclient/resources/mac files - copy_dir(os.path.join(cef_dir, 'tests/cefclient/resources/mac/'), \ - os.path.join(output_dir, 'cefclient/resources/mac/'), \ + copy_dir(os.path.join(cef_dir, 'tests/cefclient/resources/mac'), \ + os.path.join(cefclient_dir, 'resources/mac'), \ options.quiet) # transfer cefsimple files @@ -701,11 +774,21 @@ elif platform == 'macosx': 'tests/cefsimple/', cefsimple_dir, options.quiet) transfer_gypi_files(cef_dir, cef_paths2['cefsimple_sources_mac_helper'], \ 'tests/cefsimple/', cefsimple_dir, options.quiet) - transfer_gypi_files(cef_dir, cef_paths2['cefsimple_bundle_resources_mac'], \ - 'tests/cefsimple/', cefsimple_dir, options.quiet) # transfer cefsimple/mac files - copy_dir(os.path.join(cef_dir, 'tests/cefsimple/mac/'), os.path.join(output_dir, 'cefsimple/mac/'), \ + copy_dir(os.path.join(cef_dir, 'tests/cefsimple/mac'), \ + os.path.join(cefsimple_dir, 'mac'), \ + options.quiet) + + # transfer unittests files + transfer_gypi_files(cef_dir, cef_paths2['unittests_sources_mac'], \ + 'tests/unittests/', unittests_dir, options.quiet) + transfer_gypi_files(cef_dir, cef_paths2['unittests_sources_mac_helper'], \ + 'tests/unittests/', unittests_dir, options.quiet) + + # transfer unittests/resources/mac files + copy_dir(os.path.join(cef_dir, 'tests/unittests/resources/mac'), \ + os.path.join(unittests_dir, 'resources/mac'), \ options.quiet) elif platform == 'linux': @@ -771,6 +854,10 @@ elif platform == 'linux': mode, output_dir, options.quiet) if mode == 'standard': + # transfer shared files + transfer_gypi_files(cef_dir, cef_paths2['shared_sources_linux'], \ + 'tests/shared/', shared_dir, options.quiet) + # transfer cefclient files transfer_gypi_files(cef_dir, cef_paths2['cefclient_sources_linux'], \ 'tests/cefclient/', cefclient_dir, options.quiet) @@ -779,6 +866,12 @@ elif platform == 'linux': transfer_gypi_files(cef_dir, cef_paths2['cefsimple_sources_linux'], \ 'tests/cefsimple/', cefsimple_dir, options.quiet) + # transfer unittests files + transfer_gypi_files(cef_dir, cef_paths2['unittests_sources_linux'], \ + 'tests/unittests/', unittests_dir, options.quiet) + transfer_gypi_files(cef_dir, cef_paths2['unittests_sources_views'], \ + 'tests/unittests/', unittests_dir, options.quiet) + if not options.noarchive: # create an archive for each output directory archive_format = os.getenv('CEF_ARCHIVE_FORMAT', 'zip')