mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 122.0.6261.0 (#1250580)
Frame identifiers have changed from int64_t to string type. This is due to https://crbug.com/1502660 which removes access to frame routing IDs in the renderer process. New cross-process frame identifiers are 160-bit values (32-bit child process ID + 128-bit local frame token) and most easily represented as strings. All other frame-related expectations and behaviors remain the same.
This commit is contained in:
@ -33,18 +33,18 @@ index 10085136f52ce..ec1be9babecc2 100644
|
||||
}
|
||||
|
||||
diff --git chrome/browser/policy/browser_dm_token_storage_mac.mm chrome/browser/policy/browser_dm_token_storage_mac.mm
|
||||
index 5cb3cff75871c..51333ff7d85e2 100644
|
||||
index 27af6ec08f593..6dfab7c74e8da 100644
|
||||
--- chrome/browser/policy/browser_dm_token_storage_mac.mm
|
||||
+++ chrome/browser/policy/browser_dm_token_storage_mac.mm
|
||||
@@ -26,6 +26,7 @@
|
||||
@@ -27,6 +27,7 @@
|
||||
#include "base/syslog_logging.h"
|
||||
#include "base/task/thread_pool.h"
|
||||
#include "base/threading/scoped_blocking_call.h"
|
||||
+#include "chrome/browser/policy/chrome_browser_policy_connector.h"
|
||||
#include "chrome/common/chrome_paths.h"
|
||||
#include "third_party/abseil-cpp/absl/types/optional.h"
|
||||
|
||||
@@ -47,11 +48,6 @@
|
||||
namespace policy {
|
||||
@@ -47,11 +48,6 @@ const char kEnrollmentOptionsFilePath[] = FILE_PATH_LITERAL(
|
||||
"/Library/Google/Chrome/CloudManagementEnrollmentOptions");
|
||||
const char kEnrollmentMandatoryOption[] = "Mandatory";
|
||||
|
||||
@ -85,7 +85,7 @@ index 5cb3cff75871c..51333ff7d85e2 100644
|
||||
@@ -138,12 +141,19 @@ bool GetEnrollmentTokenFromFile(std::string* enrollment_token) {
|
||||
}
|
||||
|
||||
absl::optional<bool> IsEnrollmentMandatoryByPolicy() {
|
||||
std::optional<bool> IsEnrollmentMandatoryByPolicy() {
|
||||
+ base::apple::ScopedCFTypeRef<CFStringRef> bundle_id_scoper(
|
||||
+ ChromeBrowserPolicyConnector::GetBundleId());
|
||||
+ CFStringRef bundle_id = bundle_id_scoper.get();
|
||||
@ -101,11 +101,11 @@ index 5cb3cff75871c..51333ff7d85e2 100644
|
||||
if (!value || !CFPreferencesAppValueIsForced(
|
||||
- kEnrollmentMandatoryOptionPolicyName, kBundleId)) {
|
||||
+ kEnrollmentMandatoryOptionPolicyName, bundle_id)) {
|
||||
return absl::optional<bool>();
|
||||
return std::optional<bool>();
|
||||
}
|
||||
|
||||
diff --git chrome/browser/policy/chrome_browser_policy_connector.cc chrome/browser/policy/chrome_browser_policy_connector.cc
|
||||
index c012642290973..3f4d1be7f2092 100644
|
||||
index c2ecd1b63f0d7..c83704788a803 100644
|
||||
--- chrome/browser/policy/chrome_browser_policy_connector.cc
|
||||
+++ chrome/browser/policy/chrome_browser_policy_connector.cc
|
||||
@@ -13,11 +13,14 @@
|
||||
@ -135,7 +135,7 @@ index c012642290973..3f4d1be7f2092 100644
|
||||
} // namespace
|
||||
|
||||
ChromeBrowserPolicyConnector::ChromeBrowserPolicyConnector()
|
||||
@@ -265,6 +273,73 @@ void ChromeBrowserPolicyConnector::EnableCommandLineSupportForTesting() {
|
||||
@@ -270,6 +278,73 @@ void ChromeBrowserPolicyConnector::EnableCommandLineSupportForTesting() {
|
||||
g_command_line_enabled_for_testing = true;
|
||||
}
|
||||
|
||||
@ -209,7 +209,7 @@ index c012642290973..3f4d1be7f2092 100644
|
||||
base::flat_set<std::string>
|
||||
ChromeBrowserPolicyConnector::device_affiliation_ids() const {
|
||||
#if BUILDFLAG(IS_CHROMEOS_LACROS)
|
||||
@@ -336,23 +411,22 @@ ChromeBrowserPolicyConnector::CreatePolicyProviders() {
|
||||
@@ -341,23 +416,22 @@ ChromeBrowserPolicyConnector::CreatePolicyProviders() {
|
||||
std::unique_ptr<ConfigurationPolicyProvider>
|
||||
ChromeBrowserPolicyConnector::CreatePlatformProvider() {
|
||||
#if BUILDFLAG(IS_WIN)
|
||||
@ -242,7 +242,7 @@ index c012642290973..3f4d1be7f2092 100644
|
||||
auto loader = std::make_unique<PolicyLoaderMac>(
|
||||
base::ThreadPool::CreateSequencedTaskRunner(
|
||||
{base::MayBlock(), base::TaskPriority::BEST_EFFORT}),
|
||||
@@ -362,7 +436,7 @@ ChromeBrowserPolicyConnector::CreatePlatformProvider() {
|
||||
@@ -367,7 +441,7 @@ ChromeBrowserPolicyConnector::CreatePlatformProvider() {
|
||||
std::move(loader));
|
||||
#elif BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_ANDROID)
|
||||
base::FilePath config_dir_path;
|
||||
@ -252,7 +252,7 @@ index c012642290973..3f4d1be7f2092 100644
|
||||
// If the folder containing the policy files doesn't exist, there's no need
|
||||
// to have a provider for them. Note that in verified boot, the folder
|
||||
diff --git chrome/browser/policy/chrome_browser_policy_connector.h chrome/browser/policy/chrome_browser_policy_connector.h
|
||||
index daa1a4cf0820d..c33db32822fbf 100644
|
||||
index f6147bc3c59a6..78b1170dd52bb 100644
|
||||
--- chrome/browser/policy/chrome_browser_policy_connector.h
|
||||
+++ chrome/browser/policy/chrome_browser_policy_connector.h
|
||||
@@ -28,6 +28,10 @@
|
||||
@ -266,7 +266,7 @@ index daa1a4cf0820d..c33db32822fbf 100644
|
||||
class PrefService;
|
||||
|
||||
namespace policy {
|
||||
@@ -122,6 +126,25 @@ class ChromeBrowserPolicyConnector : public BrowserPolicyConnector {
|
||||
@@ -125,6 +129,25 @@ class ChromeBrowserPolicyConnector : public BrowserPolicyConnector {
|
||||
|
||||
static void EnableCommandLineSupportForTesting();
|
||||
|
||||
@ -304,7 +304,7 @@ index 1a2e78c3472ec..5d1bd95a15113 100644
|
||||
#include "components/policy/policy_constants.h"
|
||||
|
||||
namespace policy::path_parser {
|
||||
@@ -97,16 +98,12 @@
|
||||
@@ -97,16 +98,12 @@ base::FilePath::StringType ExpandPathVariables(
|
||||
void CheckUserDataDirPolicy(base::FilePath* user_data_dir) {
|
||||
// Since the configuration management infrastructure is not initialized when
|
||||
// this code runs, read the policy preference directly.
|
||||
@ -355,10 +355,10 @@ index 8dbf958c189dd..6eaccc6688eca 100644
|
||||
*dir = base::FilePath(policy::path_parser::ExpandPathVariables(value));
|
||||
return true;
|
||||
diff --git chrome/common/chrome_paths.cc chrome/common/chrome_paths.cc
|
||||
index 89678edacdadf..821c4448a8188 100644
|
||||
index 94843ce782e80..0e3cc5bdb0bd5 100644
|
||||
--- chrome/common/chrome_paths.cc
|
||||
+++ chrome/common/chrome_paths.cc
|
||||
@@ -523,7 +523,8 @@ bool PathProvider(int key, base::FilePath* result) {
|
||||
@@ -539,7 +539,8 @@ bool PathProvider(int key, base::FilePath* result) {
|
||||
return false;
|
||||
}
|
||||
break;
|
||||
@ -369,7 +369,7 @@ index 89678edacdadf..821c4448a8188 100644
|
||||
cur = base::FilePath(policy::kPolicyPath);
|
||||
break;
|
||||
diff --git chrome/common/chrome_paths.h chrome/common/chrome_paths.h
|
||||
index 03387b9680834..76191ba98e80b 100644
|
||||
index 4cde94111918e..aaf8245abd9a6 100644
|
||||
--- chrome/common/chrome_paths.h
|
||||
+++ chrome/common/chrome_paths.h
|
||||
@@ -8,6 +8,7 @@
|
||||
@ -380,7 +380,7 @@ index 03387b9680834..76191ba98e80b 100644
|
||||
#include "extensions/buildflags/buildflags.h"
|
||||
#include "third_party/widevine/cdm/buildflags.h"
|
||||
|
||||
@@ -47,7 +48,7 @@ enum {
|
||||
@@ -48,7 +49,7 @@ enum {
|
||||
DIR_INTERNAL_PLUGINS, // Directory where internal plugins reside.
|
||||
DIR_COMPONENTS, // Directory where built-in implementations of
|
||||
// component-updated libraries or data reside.
|
||||
@ -390,10 +390,10 @@ index 03387b9680834..76191ba98e80b 100644
|
||||
// policy files that allow sys-admins
|
||||
// to set policies for chrome. This directory
|
||||
diff --git components/policy/tools/generate_policy_source.py components/policy/tools/generate_policy_source.py
|
||||
index a17b30c37e07a..adcdf25e38ed1 100755
|
||||
index d225da88a04fb..191bb6b56df40 100755
|
||||
--- components/policy/tools/generate_policy_source.py
|
||||
+++ components/policy/tools/generate_policy_source.py
|
||||
@@ -486,6 +486,7 @@ def _WritePolicyConstantHeader(all_policies, policy_atomic_groups,
|
||||
@@ -448,6 +448,7 @@ def _WritePolicyConstantHeader(all_policies, policy_atomic_groups,
|
||||
#include <cstdint>
|
||||
#include <string>
|
||||
|
||||
@ -401,7 +401,7 @@ index a17b30c37e07a..adcdf25e38ed1 100755
|
||||
#include "components/policy/core/common/policy_details.h"
|
||||
#include "components/policy/core/common/policy_map.h"
|
||||
|
||||
@@ -508,9 +509,11 @@ struct SchemaData;
|
||||
@@ -470,9 +471,11 @@ struct SchemaData;
|
||||
''')
|
||||
|
||||
if target_platform == 'win':
|
||||
@ -415,7 +415,7 @@ index a17b30c37e07a..adcdf25e38ed1 100755
|
||||
|
||||
f.write('''#if BUILDFLAG(IS_CHROMEOS)
|
||||
// Sets default profile policies values for enterprise users.
|
||||
@@ -1153,12 +1156,14 @@ namespace policy {
|
||||
@@ -1115,12 +1118,14 @@ namespace policy {
|
||||
f.write('} // namespace\n\n')
|
||||
|
||||
if target_platform == 'win':
|
||||
|
Reference in New Issue
Block a user