bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium version 68.0.3440.0 (#561733)

Browse Source
This commit is contained in:
Marshall Greenblatt
2018-06-01 15:16:26 -04:00
parent 21310e4374
commit f6f2c9a0ca
51 changed files with 337 additions and 375 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patch/patches/webui_2037.patch
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 7742a5367ff0..0ec2381dc558 100644
index f68368e79f85..654b7b9312e6 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
@@ -17,6 +17,7 @@
@@ -18,6 +18,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 7742a5367ff0..0ec2381dc558 100644
#include "chrome/common/pref_names.h"
#include "components/browser_sync/profile_sync_service.h"
#include "components/prefs/pref_service.h"
@@ -171,6 +172,10 @@ void ChromeInternalLogSource::Fetch(SysLogsSourceCallback callback) {
@@ -225,6 +226,10 @@ void ChromeInternalLogSource::Fetch(SysLogsSourceCallback callback) {
}
void ChromeInternalLogSource::PopulateSyncLogs(SystemLogsResponse* response) {
@@ -21,7 +21,7 @@ index 7742a5367ff0..0ec2381dc558 100644
// We are only interested in sync logs for the primary user profile.
Profile* profile = ProfileManager::GetPrimaryUserProfile();
if (!profile ||
@@ -215,6 +220,12 @@ void ChromeInternalLogSource::PopulateExtensionInfoLogs(
@@ -269,6 +274,12 @@ void ChromeInternalLogSource::PopulateExtensionInfoLogs(
if (!profile)
return;