mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 73.0.3665.0 (#620590)
This commit is contained in:
committed by
Marshall Greenblatt
parent
10916749d6
commit
1a86240c93
@@ -27,10 +27,10 @@ index 9e81f0a33ede..b796e79ae7ef 100644
|
||||
auto* browser_context = web_contents->GetBrowserContext();
|
||||
|
||||
diff --git content/browser/frame_host/render_frame_host_manager.cc content/browser/frame_host/render_frame_host_manager.cc
|
||||
index fd7d05e26fa5..2ddb3a8ec86f 100644
|
||||
index 5a0b3cf31119..625a7d1f07ad 100644
|
||||
--- content/browser/frame_host/render_frame_host_manager.cc
|
||||
+++ content/browser/frame_host/render_frame_host_manager.cc
|
||||
@@ -923,10 +923,11 @@ bool RenderFrameHostManager::ShouldSwapBrowsingInstancesForNavigation(
|
||||
@@ -945,10 +945,11 @@ bool RenderFrameHostManager::ShouldSwapBrowsingInstancesForNavigation(
|
||||
// TODO(alexmos): This check should've been enforced earlier in the
|
||||
// navigation, in chrome::Navigate(). Verify this, and then convert this to
|
||||
// a CHECK and remove the fallback.
|
||||
@@ -46,7 +46,7 @@ index fd7d05e26fa5..2ddb3a8ec86f 100644
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -1065,7 +1066,8 @@ RenderFrameHostManager::GetSiteInstanceForNavigation(
|
||||
@@ -1087,7 +1088,8 @@ RenderFrameHostManager::GetSiteInstanceForNavigation(
|
||||
|
||||
// Double-check that the new SiteInstance is associated with the right
|
||||
// BrowserContext.
|
||||
@@ -57,10 +57,10 @@ index fd7d05e26fa5..2ddb3a8ec86f 100644
|
||||
// If |new_instance| is a new SiteInstance for a subframe that requires a
|
||||
// dedicated process, set its process reuse policy so that such subframes are
|
||||
diff --git content/public/browser/content_browser_client.h content/public/browser/content_browser_client.h
|
||||
index ff83421f2bb8..50bf5d594401 100644
|
||||
index cde35f745f61..7b2e477a6aae 100644
|
||||
--- content/public/browser/content_browser_client.h
|
||||
+++ content/public/browser/content_browser_client.h
|
||||
@@ -450,6 +450,13 @@ class CONTENT_EXPORT ContentBrowserClient {
|
||||
@@ -452,6 +452,13 @@ class CONTENT_EXPORT ContentBrowserClient {
|
||||
// Returns true if error page should be isolated in its own process.
|
||||
virtual bool ShouldIsolateErrorPage(bool in_main_frame);
|
||||
|
||||
@@ -74,6 +74,17 @@ index ff83421f2bb8..50bf5d594401 100644
|
||||
// Returns true if the passed in URL should be assigned as the site of the
|
||||
// current SiteInstance, if it does not yet have a site.
|
||||
virtual bool ShouldAssignSiteForURL(const GURL& url);
|
||||
@@ -1457,6 +1464,10 @@ class CONTENT_EXPORT ContentBrowserClient {
|
||||
// Used as part of the user agent string.
|
||||
virtual std::string GetProduct() const;
|
||||
|
||||
+ // Returns the Chrome-specific product string. This is used for compatibility
|
||||
+ // purposes with external tools like Selenium.
|
||||
+ virtual std::string GetChromeProduct() const { return GetProduct(); }
|
||||
+
|
||||
// Returns the user agent. Content may cache this value.
|
||||
virtual std::string GetUserAgent() const;
|
||||
};
|
||||
diff --git extensions/browser/extension_host.cc extensions/browser/extension_host.cc
|
||||
index 6cf7f34bfbd7..a2dcdb88fbe3 100644
|
||||
--- extensions/browser/extension_host.cc
|
||||
@@ -180,7 +191,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 5a2533dc788f..b21e25a9af25 100644
|
||||
index 380b2d3326f6..733918754949 100644
|
||||
--- extensions/browser/extensions_browser_client.h
|
||||
+++ extensions/browser/extensions_browser_client.h
|
||||
@@ -61,6 +61,7 @@ class ComponentExtensionResourceManager;
|
||||
@@ -219,10 +230,10 @@ index 5a2533dc788f..b21e25a9af25 100644
|
||||
// once each time the extensions system is loaded per browser_context. The
|
||||
// implementation may wish to use the BrowserContext to record the current
|
||||
diff --git extensions/browser/process_manager.cc extensions/browser/process_manager.cc
|
||||
index fde870c09c6e..b5a285cecb86 100644
|
||||
index 67b3acf91900..e1200aa01778 100644
|
||||
--- extensions/browser/process_manager.cc
|
||||
+++ extensions/browser/process_manager.cc
|
||||
@@ -357,9 +357,16 @@ bool ProcessManager::CreateBackgroundHost(const Extension* extension,
|
||||
@@ -359,9 +359,16 @@ bool ProcessManager::CreateBackgroundHost(const Extension* extension,
|
||||
return true; // TODO(kalman): return false here? It might break things...
|
||||
|
||||
DVLOG(1) << "CreateBackgroundHost " << extension->id();
|
||||
|
Reference in New Issue
Block a user