Update to Chromium version 79.0.3945.1 (#706915)

This commit is contained in:
Daniel Nitsche
2019-11-12 11:11:44 -05:00
committed by Marshall Greenblatt
parent b9fc93955c
commit 115f760821
103 changed files with 662 additions and 756 deletions

View File

@@ -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 ab59df1d9b16..d8a853bd110c 100644
index 2d4001283821..2daa4dfae045 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
@@ -21,6 +21,7 @@
@@ -27,6 +27,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 ab59df1d9b16..d8a853bd110c 100644
#include "components/prefs/pref_service.h"
#include "components/sync/driver/about_sync_util.h"
#include "components/sync/driver/sync_service.h"
@@ -269,6 +270,10 @@ void ChromeInternalLogSource::Fetch(SysLogsSourceCallback callback) {
@@ -318,6 +319,10 @@ void ChromeInternalLogSource::Fetch(SysLogsSourceCallback callback) {
}
void ChromeInternalLogSource::PopulateSyncLogs(SystemLogsResponse* response) {
@@ -21,7 +21,7 @@ index ab59df1d9b16..d8a853bd110c 100644
// We are only interested in sync logs for the primary user profile.
Profile* profile = ProfileManager::GetPrimaryUserProfile();
if (!profile || !ProfileSyncServiceFactory::HasSyncService(profile))
@@ -311,6 +316,12 @@ void ChromeInternalLogSource::PopulateExtensionInfoLogs(
@@ -360,6 +365,12 @@ void ChromeInternalLogSource::PopulateExtensionInfoLogs(
if (!profile)
return;
@@ -34,7 +34,7 @@ index ab59df1d9b16..d8a853bd110c 100644
extensions::ExtensionRegistry* extension_registry =
extensions::ExtensionRegistry::Get(profile);
std::string extensions_list;
@@ -389,6 +400,8 @@ void ChromeInternalLogSource::PopulateLocalStateSettings(
@@ -438,6 +449,8 @@ void ChromeInternalLogSource::PopulateLocalStateSettings(
#if defined(OS_WIN)
void ChromeInternalLogSource::PopulateUsbKeyboardDetected(
SystemLogsResponse* response) {
@@ -42,7 +42,7 @@ index ab59df1d9b16..d8a853bd110c 100644
+ base::ScopedAllowBlockingForTesting allow_blocking;
std::string reason;
bool result =
base::win::IsKeyboardPresentOnSlate(&reason, ui::GetHiddenWindow());
base::win::IsKeyboardPresentOnSlate(ui::GetHiddenWindow(), &reason);
diff --git chrome/browser/memory_details.cc chrome/browser/memory_details.cc
index 8a32ddd423c1..34abc57cc3a2 100644
--- chrome/browser/memory_details.cc