mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 100.0.4896.0 (#972766)
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
diff --git chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc
|
||||
index a09a1c38dc293..bd28d427873a9 100644
|
||||
index e1e151f58d06f..7ee1d16fa9ffc 100644
|
||||
--- chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc
|
||||
+++ chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc
|
||||
@@ -10,6 +10,7 @@
|
||||
@@ -10,15 +10,17 @@ index a09a1c38dc293..bd28d427873a9 100644
|
||||
#include "base/json/json_string_value_serializer.h"
|
||||
#include "base/logging.h"
|
||||
#include "base/path_service.h"
|
||||
@@ -22,6 +23,7 @@
|
||||
@@ -19,14 +20,17 @@
|
||||
#include "base/system/sys_info.h"
|
||||
#include "base/task/post_task.h"
|
||||
#include "base/task/thread_pool.h"
|
||||
+#include "base/threading/thread_restrictions.h"
|
||||
#include "build/branding_buildflags.h"
|
||||
#include "build/build_config.h"
|
||||
#include "build/chromeos_buildflags.h"
|
||||
+#include "cef/libcef/features/runtime.h"
|
||||
#include "chrome/browser/browser_process.h"
|
||||
#include "chrome/browser/data_reduction_proxy/data_reduction_proxy_chrome_settings.h"
|
||||
#include "chrome/browser/data_reduction_proxy/data_reduction_proxy_chrome_settings_factory.h"
|
||||
@@ -29,6 +31,7 @@
|
||||
#include "chrome/browser/google/google_brand.h"
|
||||
#include "chrome/browser/profiles/profile_manager.h"
|
||||
#include "chrome/browser/sync/sync_service_factory.h"
|
||||
#include "chrome/common/channel_info.h"
|
||||
@@ -26,7 +28,7 @@ index a09a1c38dc293..bd28d427873a9 100644
|
||||
#include "components/prefs/pref_service.h"
|
||||
#include "components/sync/driver/sync_internals_util.h"
|
||||
#include "components/sync/driver/sync_service.h"
|
||||
@@ -334,7 +337,11 @@ void ChromeInternalLogSource::Fetch(SysLogsSourceCallback callback) {
|
||||
@@ -331,7 +335,11 @@ void ChromeInternalLogSource::Fetch(SysLogsSourceCallback callback) {
|
||||
response->emplace(kOsVersionTag, os_version);
|
||||
#endif
|
||||
|
||||
@@ -38,8 +40,8 @@ index a09a1c38dc293..bd28d427873a9 100644
|
||||
+ }
|
||||
PopulateExtensionInfoLogs(response.get());
|
||||
PopulatePowerApiLogs(response.get());
|
||||
PopulateDataReductionProxyLogs(response.get());
|
||||
@@ -414,6 +421,12 @@ void ChromeInternalLogSource::PopulateExtensionInfoLogs(
|
||||
#if BUILDFLAG(IS_WIN)
|
||||
@@ -410,6 +418,12 @@ void ChromeInternalLogSource::PopulateExtensionInfoLogs(
|
||||
if (!profile)
|
||||
return;
|
||||
|
||||
@@ -52,7 +54,7 @@ index a09a1c38dc293..bd28d427873a9 100644
|
||||
extensions::ExtensionRegistry* extension_registry =
|
||||
extensions::ExtensionRegistry::Get(profile);
|
||||
std::string extensions_list;
|
||||
@@ -521,6 +534,8 @@ void ChromeInternalLogSource::PopulateOnboardingTime(
|
||||
@@ -504,6 +518,8 @@ void ChromeInternalLogSource::PopulateOnboardingTime(
|
||||
#if BUILDFLAG(IS_WIN)
|
||||
void ChromeInternalLogSource::PopulateUsbKeyboardDetected(
|
||||
SystemLogsResponse* response) {
|
||||
|
Reference in New Issue
Block a user