mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 82.0.4085.0 (#749737)
- Building on macOS now requires the 10.15 SDK. Xcode 11.3 is recommended as Xcode 11.4 is not currently supported (see https://crbug.com/1065146). - Jumbo build configuration is no longer supported. Chromium is skipping the M82 release and consequently no CEF 4085 branch will be created. For details on the Chromium decision see https://groups.google.com/a/chromium.org/d/msg/chromium-dev/Vn7uzglqLz0/JItlSrZxBAAJ
This commit is contained in:
@ -1,8 +1,8 @@
|
||||
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 f68789fe4c05..089800c7a26a 100644
|
||||
index 29953fdc7c55..fb03891ede32 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
|
||||
@@ -27,6 +27,7 @@
|
||||
@@ -28,6 +28,7 @@
|
||||
#include "chrome/browser/profiles/profile_manager.h"
|
||||
#include "chrome/browser/sync/profile_sync_service_factory.h"
|
||||
#include "chrome/common/channel_info.h"
|
||||
@ -10,7 +10,7 @@ index f68789fe4c05..089800c7a26a 100644
|
||||
#include "components/prefs/pref_service.h"
|
||||
#include "components/sync/driver/about_sync_util.h"
|
||||
#include "components/sync/driver/sync_service.h"
|
||||
@@ -323,6 +324,10 @@ void ChromeInternalLogSource::Fetch(SysLogsSourceCallback callback) {
|
||||
@@ -322,6 +323,10 @@ void ChromeInternalLogSource::Fetch(SysLogsSourceCallback callback) {
|
||||
}
|
||||
|
||||
void ChromeInternalLogSource::PopulateSyncLogs(SystemLogsResponse* response) {
|
||||
@ -21,7 +21,7 @@ index f68789fe4c05..089800c7a26a 100644
|
||||
// We are only interested in sync logs for the primary user profile.
|
||||
Profile* profile = ProfileManager::GetPrimaryUserProfile();
|
||||
if (!profile || !ProfileSyncServiceFactory::HasSyncService(profile))
|
||||
@@ -365,6 +370,12 @@ void ChromeInternalLogSource::PopulateExtensionInfoLogs(
|
||||
@@ -364,6 +369,12 @@ void ChromeInternalLogSource::PopulateExtensionInfoLogs(
|
||||
if (!profile)
|
||||
return;
|
||||
|
||||
@ -34,7 +34,7 @@ index f68789fe4c05..089800c7a26a 100644
|
||||
extensions::ExtensionRegistry* extension_registry =
|
||||
extensions::ExtensionRegistry::Get(profile);
|
||||
std::string extensions_list;
|
||||
@@ -454,6 +465,8 @@ void ChromeInternalLogSource::PopulateArcPolicyStatus(
|
||||
@@ -453,6 +464,8 @@ void ChromeInternalLogSource::PopulateArcPolicyStatus(
|
||||
#if defined(OS_WIN)
|
||||
void ChromeInternalLogSource::PopulateUsbKeyboardDetected(
|
||||
SystemLogsResponse* response) {
|
||||
@ -44,18 +44,18 @@ index f68789fe4c05..089800c7a26a 100644
|
||||
bool result =
|
||||
base::win::IsKeyboardPresentOnSlate(ui::GetHiddenWindow(), &reason);
|
||||
diff --git chrome/browser/memory_details.cc chrome/browser/memory_details.cc
|
||||
index a75f82d26388..19ddd09cc379 100644
|
||||
index d42895d9db3f..74a6d407bbcd 100644
|
||||
--- chrome/browser/memory_details.cc
|
||||
+++ chrome/browser/memory_details.cc
|
||||
@@ -17,6 +17,7 @@
|
||||
#include "base/task/post_task.h"
|
||||
@@ -18,6 +18,7 @@
|
||||
#include "base/task/thread_pool.h"
|
||||
#include "build/build_config.h"
|
||||
#include "chrome/browser/profiles/profile.h"
|
||||
+#include "chrome/common/chrome_switches.h"
|
||||
#include "components/nacl/common/nacl_process_type.h"
|
||||
#include "components/strings/grit/components_strings.h"
|
||||
#include "content/public/browser/browser_child_process_host_iterator.h"
|
||||
@@ -249,8 +250,11 @@ void MemoryDetails::CollectChildInfoOnUIThread() {
|
||||
@@ -250,8 +251,11 @@ void MemoryDetails::CollectChildInfoOnUIThread() {
|
||||
|
||||
#if BUILDFLAG(ENABLE_EXTENSIONS)
|
||||
// Determine if this is an extension process.
|
||||
|
Reference in New Issue
Block a user