Update to Chromium version 78.0.3904.0 (#693954)

This commit is contained in:
Marshall Greenblatt
2019-10-01 13:55:16 +00:00
parent c8b457da38
commit f8e0797773
151 changed files with 1485 additions and 2238 deletions

View File

@@ -1,8 +1,8 @@
diff --git chrome/browser/chrome_content_browser_client.cc chrome/browser/chrome_content_browser_client.cc
index 0b29bc11f07c..9c0ffba4dc20 100644
index b1d5ac049933..cfb78bb97597 100644
--- chrome/browser/chrome_content_browser_client.cc
+++ chrome/browser/chrome_content_browser_client.cc
@@ -1067,10 +1067,6 @@ void LaunchURL(
@@ -1013,10 +1013,6 @@ void LaunchURL(const GURL& url,
}
}
@@ -13,7 +13,7 @@ index 0b29bc11f07c..9c0ffba4dc20 100644
void MaybeAppendSecureOriginsAllowlistSwitch(base::CommandLine* cmdline) {
// |allowlist| combines pref/policy + cmdline switch in the browser process.
// For renderer and utility (e.g. NetworkService) processes the switch is the
@@ -1088,6 +1084,14 @@ void MaybeAppendSecureOriginsAllowlistSwitch(base::CommandLine* cmdline) {
@@ -1059,6 +1055,14 @@ base::FilePath GetModulePath(base::StringPiece16 module_name) {
} // namespace
@@ -29,10 +29,10 @@ index 0b29bc11f07c..9c0ffba4dc20 100644
base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
if (command_line->HasSwitch(switches::kUserAgent)) {
diff --git chrome/browser/chrome_content_browser_client.h chrome/browser/chrome_content_browser_client.h
index 069f597633a2..e81d7718cfca 100644
index 6bb50192ce17..6cb6a28d3114 100644
--- chrome/browser/chrome_content_browser_client.h
+++ chrome/browser/chrome_content_browser_client.h
@@ -84,7 +84,8 @@ enum class Channel;
@@ -85,7 +85,8 @@ enum class Channel;
class ChromeHidDelegate;
class ChromeSerialDelegate;