diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-01-20 13:40:20 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-01-22 12:41:23 +0000 |
commit | 7961cea6d1041e3e454dae6a1da660b453efd238 (patch) | |
tree | c0eeb4a9ff9ba32986289c1653d9608e53ccb444 /chromium/remoting | |
parent | b7034d0803538058e5c9d904ef03cf5eab34f6ef (diff) | |
download | qtwebengine-chromium-7961cea6d1041e3e454dae6a1da660b453efd238.tar.gz |
BASELINE: Update Chromium to 78.0.3904.130
Change-Id: If185e0c0061b3437531c97c9c8c78f239352a68b
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/remoting')
-rw-r--r-- | chromium/remoting/android/client_java_tmpl.gni | 1 | ||||
-rw-r--r-- | chromium/remoting/host/BUILD.gn | 4 | ||||
-rw-r--r-- | chromium/remoting/host/installer/mac/BUILD.gn | 7 | ||||
-rw-r--r-- | chromium/remoting/host/mac/BUILD.gn | 5 | ||||
-rw-r--r-- | chromium/remoting/remoting_version.gni | 8 | ||||
-rw-r--r-- | chromium/remoting/resources/BUILD.gn | 1 |
6 files changed, 17 insertions, 9 deletions
diff --git a/chromium/remoting/android/client_java_tmpl.gni b/chromium/remoting/android/client_java_tmpl.gni index 92dc7eca06e..7c56ed8916a 100644 --- a/chromium/remoting/android/client_java_tmpl.gni +++ b/chromium/remoting/android/client_java_tmpl.gni @@ -88,6 +88,7 @@ template("remoting_android_client_java_tmpl") { "//remoting/proto/remoting/v1:directory_proto_java", "//third_party/android_deps:android_arch_lifecycle_common_java", "//third_party/android_deps:android_support_v7_appcompat_java", + "//third_party/android_deps:com_android_support_drawerlayout_java", "//third_party/android_deps:com_android_support_mediarouter_v7_java", "//third_party/android_deps:com_android_support_support_annotations_java", "//third_party/android_deps:com_google_protobuf_protobuf_lite_java", diff --git a/chromium/remoting/host/BUILD.gn b/chromium/remoting/host/BUILD.gn index c3ab224b5a0..2733d58776a 100644 --- a/chromium/remoting/host/BUILD.gn +++ b/chromium/remoting/host/BUILD.gn @@ -292,6 +292,8 @@ static_library("common") { "username.h", "xmpp_register_support_host_request.cc", "xmpp_register_support_host_request.h", + "xsession_chooser_linux.cc", + "xsession_chooser_ui.inc", ] libs = [] @@ -384,6 +386,7 @@ static_library("common") { "disconnect_window_linux.cc", "me2me_desktop_environment.cc", "me2me_desktop_environment.h", + "xsession_chooser_linux.cc", ] deps += [ "//ash", @@ -527,6 +530,7 @@ source_set("unit_tests") { deps = [ ":common", ":test_support", + "//build:branding_buildflags", "//remoting/host/file_transfer:unit_tests", "//remoting/host/it2me:common", "//remoting/host/native_messaging", diff --git a/chromium/remoting/host/installer/mac/BUILD.gn b/chromium/remoting/host/installer/mac/BUILD.gn index 99492235770..505fcccc169 100644 --- a/chromium/remoting/host/installer/mac/BUILD.gn +++ b/chromium/remoting/host/installer/mac/BUILD.gn @@ -58,9 +58,9 @@ action("remoting_me2me_host_archive") { "remoting/com.google.chrome.remote_desktop-firefox.json", "remoting/com.google.chrome.remote_assistance-firefox.json", "--generated-files-dst", - "PrivilegedHelperTools/$host_bundle_name", - "PrivilegedHelperTools/$host_bundle_name/Contents/MacOS/$native_messaging_host_bundle_name", - "PrivilegedHelperTools/$host_bundle_name/Contents/MacOS/$remote_assistance_host_bundle_name", + "PrivilegedHelperTools/$me2me_host_bundle_name", + "PrivilegedHelperTools/$me2me_host_bundle_name/Contents/MacOS/$native_messaging_host_bundle_name", + "PrivilegedHelperTools/$me2me_host_bundle_name/Contents/MacOS/$remote_assistance_host_bundle_name", "Applications/$host_uninstaller_name.app", "Config/com.google.chrome.remote_desktop.json", "Config/com.google.chrome.remote_assistance.json", @@ -73,6 +73,7 @@ action("remoting_me2me_host_archive") { "VERSION_MINOR=$chrome_version_minor", "HOST_NAME=$host_name", "HOST_BUNDLE_NAME=$me2me_host_bundle_name", + "HOST_LEGACY_BUNDLE_NAME=$me2me_host_legacy_bundle_name", "HOST_SERVICE_NAME=$host_service_name", "HOST_UNINSTALLER_NAME=$host_uninstaller_name", "HOST_PKG=$host_name", diff --git a/chromium/remoting/host/mac/BUILD.gn b/chromium/remoting/host/mac/BUILD.gn index ba7dfe874df..10b613be0d9 100644 --- a/chromium/remoting/host/mac/BUILD.gn +++ b/chromium/remoting/host/mac/BUILD.gn @@ -5,7 +5,10 @@ import("//remoting/build/config/remoting_build.gni") source_set("constants") { - defines = [ "HOST_BUNDLE_NAME=\"" + host_bundle_name + "\"" ] + defines = [ + "HOST_BUNDLE_NAME=\"" + me2me_host_bundle_name + "\"", + "HOST_LEGACY_BUNDLE_NAME=\"" + me2me_host_legacy_bundle_name + "\"", + ] sources = [ "constants_mac.cc", diff --git a/chromium/remoting/remoting_version.gni b/chromium/remoting/remoting_version.gni index 825c97ff067..f3278056eb4 100644 --- a/chromium/remoting/remoting_version.gni +++ b/chromium/remoting/remoting_version.gni @@ -25,11 +25,11 @@ _remoting_version_path = rebase_path(remoting_version_file, root_build_dir) _remoting_branding_path = rebase_path(_remoting_branding_abspath, root_build_dir) -_template = "mac_host_bundle = \"@MAC_HOST_BUNDLE_NAME@\" " -_template += +_template = "mac_native_messaging_bundle = \"@MAC_NATIVE_MESSAGING_HOST_BUNDLE_NAME@\" " _template += "mac_remote_assistance_bundle = \"@MAC_REMOTE_ASSISTANCE_HOST_BUNDLE_NAME@\" " _template += "host_bundle_name = \"@MAC_HOST_BUNDLE_NAME@\" " +_template += "host_legacy_bundle_name = \"@MAC_HOST_LEGACY_BUNDLE_NAME@\" " _template += "host_name= \"@MAC_HOST_PACKAGE_NAME@\" " _template += "host_service_name = \"@DAEMON_FILE_NAME@\" " _template += "bundle_prefix = \"@MAC_UNINSTALLER_BUNDLE_PREFIX@\" " @@ -62,12 +62,12 @@ _result = exec_script(_version_py_abspath, "scope", remoting_version_files) -host_bundle_name = _result.host_bundle_name host_name = _result.host_name host_service_name = _result.host_service_name bundle_prefix = _result.bundle_prefix host_uninstaller_name = _result.host_uninstaller_name -me2me_host_bundle_name = _result.mac_host_bundle +me2me_host_bundle_name = _result.host_bundle_name +me2me_host_legacy_bundle_name = _result.host_legacy_bundle_name native_messaging_host_bundle_name = _result.mac_native_messaging_bundle remote_assistance_host_bundle_name = _result.mac_remote_assistance_bundle remoting_version_patch = _result.version_patch diff --git a/chromium/remoting/resources/BUILD.gn b/chromium/remoting/resources/BUILD.gn index bbe591fb14b..cf5d4cdee28 100644 --- a/chromium/remoting/resources/BUILD.gn +++ b/chromium/remoting/resources/BUILD.gn @@ -31,7 +31,6 @@ action("verify_resources") { "../host/win/core.rc.jinja2", "../host/win/host_messages.mc.jinja2", "../host/win/version.rc.jinja2", - "../resources/play_store_resources.cc", "../webapp/crd/js/background.js", "../webapp/base/js/error.js", "../webapp/crd/js/host_list.js", |