Update to Chromium version 70.0.3538.35

This commit is contained in:
Marshall Greenblatt
2018-09-28 15:40:26 +02:00
parent b8ca094aca
commit df6fb4f06e
19 changed files with 71 additions and 66 deletions

View File

@@ -180,7 +180,7 @@ index ad1ef1bd0b8f..8014a61c5083 100644
// A weak pointer to the current or pending RenderViewHost. We don't access
// this through the host_contents because we want to deal with the pending
diff --git extensions/browser/extensions_browser_client.h extensions/browser/extensions_browser_client.h
index 7e0c178e1e36..98066c8437a1 100644
index 5a2533dc788f..b21e25a9af25 100644
--- extensions/browser/extensions_browser_client.h
+++ extensions/browser/extensions_browser_client.h
@@ -61,6 +61,7 @@ class ComponentExtensionResourceManager;
@@ -191,7 +191,7 @@ index 7e0c178e1e36..98066c8437a1 100644
class ExtensionHostDelegate;
class ExtensionPrefsObserver;
class ExtensionApiFrameIdMap;
@@ -132,6 +133,11 @@ class ExtensionsBrowserClient {
@@ -133,6 +134,11 @@ class ExtensionsBrowserClient {
virtual content::BrowserContext* GetOriginalContext(
content::BrowserContext* context) = 0;
@@ -203,7 +203,7 @@ index 7e0c178e1e36..98066c8437a1 100644
#if defined(OS_CHROMEOS)
// Returns a user id hash from |context| or an empty string if no hash could
// be extracted.
@@ -214,6 +220,14 @@ class ExtensionsBrowserClient {
@@ -215,6 +221,14 @@ class ExtensionsBrowserClient {
virtual std::unique_ptr<ExtensionHostDelegate>
CreateExtensionHostDelegate() = 0;