mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 132.0.6834.0
This commit is contained in:
@ -105,7 +105,7 @@ index d8fda08453256..466718e824503 100644
|
||||
}
|
||||
|
||||
diff --git chrome/browser/policy/chrome_browser_policy_connector.cc chrome/browser/policy/chrome_browser_policy_connector.cc
|
||||
index cf3c9a1871a35..0577e8f8b60ec 100644
|
||||
index 440b8aaca8f0f..fec585790788d 100644
|
||||
--- chrome/browser/policy/chrome_browser_policy_connector.cc
|
||||
+++ chrome/browser/policy/chrome_browser_policy_connector.cc
|
||||
@@ -13,11 +13,14 @@
|
||||
@ -123,7 +123,7 @@ index cf3c9a1871a35..0577e8f8b60ec 100644
|
||||
#include "chrome/browser/browser_process.h"
|
||||
#include "chrome/browser/enterprise/browser_management/management_service_factory.h"
|
||||
#include "chrome/browser/policy/configuration_policy_handler_list_factory.h"
|
||||
@@ -82,6 +85,11 @@
|
||||
@@ -75,6 +78,11 @@
|
||||
namespace policy {
|
||||
namespace {
|
||||
bool g_command_line_enabled_for_testing = false;
|
||||
@ -135,7 +135,7 @@ index cf3c9a1871a35..0577e8f8b60ec 100644
|
||||
} // namespace
|
||||
|
||||
ChromeBrowserPolicyConnector::ChromeBrowserPolicyConnector()
|
||||
@@ -278,6 +286,73 @@ void ChromeBrowserPolicyConnector::EnableCommandLineSupportForTesting() {
|
||||
@@ -255,6 +263,73 @@ void ChromeBrowserPolicyConnector::EnableCommandLineSupportForTesting() {
|
||||
g_command_line_enabled_for_testing = true;
|
||||
}
|
||||
|
||||
@ -209,7 +209,7 @@ index cf3c9a1871a35..0577e8f8b60ec 100644
|
||||
base::flat_set<std::string>
|
||||
ChromeBrowserPolicyConnector::device_affiliation_ids() const {
|
||||
if (!device_affiliation_ids_for_testing_.empty()) {
|
||||
@@ -357,25 +432,22 @@ ChromeBrowserPolicyConnector::CreatePolicyProviders() {
|
||||
@@ -318,25 +393,22 @@ ChromeBrowserPolicyConnector::CreatePolicyProviders() {
|
||||
std::unique_ptr<ConfigurationPolicyProvider>
|
||||
ChromeBrowserPolicyConnector::CreatePlatformProvider() {
|
||||
#if BUILDFLAG(IS_WIN)
|
||||
@ -244,7 +244,7 @@ index cf3c9a1871a35..0577e8f8b60ec 100644
|
||||
auto loader = std::make_unique<PolicyLoaderMac>(
|
||||
base::ThreadPool::CreateSequencedTaskRunner(
|
||||
{base::MayBlock(), base::TaskPriority::BEST_EFFORT}),
|
||||
@@ -385,7 +457,7 @@ ChromeBrowserPolicyConnector::CreatePlatformProvider() {
|
||||
@@ -346,7 +418,7 @@ ChromeBrowserPolicyConnector::CreatePlatformProvider() {
|
||||
std::move(loader));
|
||||
#elif BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS)
|
||||
base::FilePath config_dir_path;
|
||||
@ -254,12 +254,12 @@ index cf3c9a1871a35..0577e8f8b60ec 100644
|
||||
base::ThreadPool::CreateSequencedTaskRunner(
|
||||
{base::MayBlock(), base::TaskPriority::BEST_EFFORT}),
|
||||
diff --git chrome/browser/policy/chrome_browser_policy_connector.h chrome/browser/policy/chrome_browser_policy_connector.h
|
||||
index e4c6792766ae4..0a0c054d9e4d1 100644
|
||||
index 40ce1cf15d277..e98c6e999fb5b 100644
|
||||
--- chrome/browser/policy/chrome_browser_policy_connector.h
|
||||
+++ chrome/browser/policy/chrome_browser_policy_connector.h
|
||||
@@ -28,6 +28,10 @@
|
||||
#include "components/policy/core/common/policy_loader_lacros.h"
|
||||
#endif // BUILDFLAG(IS_CHROMEOS_LACROS)
|
||||
@@ -23,6 +23,10 @@
|
||||
#include "components/policy/core/browser/android/policy_cache_updater_android.h"
|
||||
#endif
|
||||
|
||||
+#if BUILDFLAG(IS_MAC)
|
||||
+#include "base/apple/scoped_cftyperef.h"
|
||||
@ -268,7 +268,7 @@ index e4c6792766ae4..0a0c054d9e4d1 100644
|
||||
class PrefService;
|
||||
|
||||
namespace policy {
|
||||
@@ -135,6 +139,25 @@ class ChromeBrowserPolicyConnector : public BrowserPolicyConnector {
|
||||
@@ -128,6 +132,25 @@ class ChromeBrowserPolicyConnector : public BrowserPolicyConnector {
|
||||
|
||||
static void EnableCommandLineSupportForTesting();
|
||||
|
||||
@ -357,13 +357,13 @@ 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 ec09803ffabcf..9a39e6172293f 100644
|
||||
index a467b25145684..8727050b93a35 100644
|
||||
--- chrome/common/chrome_paths.cc
|
||||
+++ chrome/common/chrome_paths.cc
|
||||
@@ -535,7 +535,8 @@ bool PathProvider(int key, base::FilePath* result) {
|
||||
return false;
|
||||
}
|
||||
@@ -525,7 +525,8 @@ bool PathProvider(int key, base::FilePath* result) {
|
||||
break;
|
||||
}
|
||||
#endif
|
||||
-#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_OPENBSD)
|
||||
+#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_OPENBSD) && \
|
||||
+ !BUILDFLAG(ENABLE_CEF)
|
||||
@ -371,7 +371,7 @@ index ec09803ffabcf..9a39e6172293f 100644
|
||||
cur = base::FilePath(policy::kPolicyPath);
|
||||
break;
|
||||
diff --git chrome/common/chrome_paths.h chrome/common/chrome_paths.h
|
||||
index 13abfd26b92b3..acb4d58f02650 100644
|
||||
index fbfe597d09d9a..b8067f8d9ecd7 100644
|
||||
--- chrome/common/chrome_paths.h
|
||||
+++ chrome/common/chrome_paths.h
|
||||
@@ -8,6 +8,7 @@
|
||||
@ -382,17 +382,17 @@ index 13abfd26b92b3..acb4d58f02650 100644
|
||||
#include "extensions/buildflags/buildflags.h"
|
||||
#include "third_party/widevine/cdm/buildflags.h"
|
||||
|
||||
@@ -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.
|
||||
@@ -51,7 +52,7 @@ enum {
|
||||
#if BUILDFLAG(IS_MAC)
|
||||
DIR_OUTER_BUNDLE, // Directory that is the outermost Chromium bundle.
|
||||
#endif
|
||||
-#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC)
|
||||
+#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(ENABLE_CEF)
|
||||
DIR_POLICY_FILES, // Directory for system-wide read-only
|
||||
// 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 be1553785d5b5..2446e30bea57e 100755
|
||||
index 41f2f032eeaa6..cd191b61b9c1e 100755
|
||||
--- components/policy/tools/generate_policy_source.py
|
||||
+++ components/policy/tools/generate_policy_source.py
|
||||
@@ -465,6 +465,7 @@ def _WritePolicyConstantHeader(all_policies, policy_atomic_groups,
|
||||
|
Reference in New Issue
Block a user