Update to Chromium version 94.0.4606.0 (#911515)

This commit is contained in:
Marshall Greenblatt
2021-08-19 19:40:49 -04:00
parent 955097ea77
commit 25c1947f1d
85 changed files with 745 additions and 726 deletions

View File

@@ -60,7 +60,7 @@ index 5c903a13a14ed..c85964a7bab17 100644
std::unique_ptr<StreamContainer> stream_container(
new StreamContainer(tab_id, embedded, handler_url, extension_id,
diff --git extensions/browser/extension_host.cc extensions/browser/extension_host.cc
index 7e38155c3b695..78768b28d8c99 100644
index 3f78873130d14..07159e4524155 100644
--- extensions/browser/extension_host.cc
+++ extensions/browser/extension_host.cc
@@ -63,11 +63,12 @@ ExtensionHost::ExtensionHost(const Extension* extension,
@@ -125,7 +125,7 @@ index 7e38155c3b695..78768b28d8c99 100644
ExtensionRegistry::Get(browser_context_)->RemoveObserver(this);
diff --git extensions/browser/extension_host.h extensions/browser/extension_host.h
index 305726557f2ea..caa4b798a013e 100644
index e8b4ce11bcd00..617de0d501fdd 100644
--- extensions/browser/extension_host.h
+++ extensions/browser/extension_host.h
@@ -53,13 +53,19 @@ class ExtensionHost : public DeferredStartRenderHost,
@@ -149,7 +149,7 @@ index 305726557f2ea..caa4b798a013e 100644
content::RenderFrameHost* main_frame_host() const { return main_frame_host_; }
content::RenderProcessHost* render_process_host() const;
bool has_loaded_once() const { return has_loaded_once_; }
@@ -182,7 +188,8 @@ class ExtensionHost : public DeferredStartRenderHost,
@@ -184,7 +190,8 @@ class ExtensionHost : public DeferredStartRenderHost,
content::BrowserContext* browser_context_;
// The host for our HTML content.
@@ -160,7 +160,7 @@ index 305726557f2ea..caa4b798a013e 100644
// A pointer to the current or speculative main frame in `host_contents_`. We
// can't access this frame through the `host_contents_` directly as it does
diff --git extensions/browser/extensions_browser_client.h extensions/browser/extensions_browser_client.h
index 530de7eea3649..3af4fb0179aa1 100644
index 0d21ebc927042..a08ebcbafc252 100644
--- extensions/browser/extensions_browser_client.h
+++ extensions/browser/extensions_browser_client.h
@@ -27,6 +27,7 @@
@@ -179,7 +179,7 @@ index 530de7eea3649..3af4fb0179aa1 100644
class ExtensionHostDelegate;
class ExtensionSet;
class ExtensionSystem;
@@ -207,6 +209,14 @@ class ExtensionsBrowserClient {
@@ -206,6 +208,14 @@ class ExtensionsBrowserClient {
virtual std::unique_ptr<ExtensionHostDelegate>
CreateExtensionHostDelegate() = 0;