mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 120.0.6099.0 (#1217362)
- chrome: Disable upgrade/downgrade behavior (see #3608) - chrome: Disable process singleton behavior (see #3609) - chrome: Disable config as default system browser (see #3613)
This commit is contained in:
@ -60,11 +60,11 @@ index cead7cfa14bae..24142c2e4896f 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 9c44797e9e238..b61704db987b6 100644
|
||||
index bf2c4d83e99b0..55c8c05898e2d 100644
|
||||
--- extensions/browser/extension_host.cc
|
||||
+++ extensions/browser/extension_host.cc
|
||||
@@ -62,12 +62,13 @@ ExtensionHost::ExtensionHost(const Extension* extension,
|
||||
host_type == mojom::ViewType::kExtensionDialog ||
|
||||
host_type == mojom::ViewType::kOffscreenDocument ||
|
||||
host_type == mojom::ViewType::kExtensionPopup ||
|
||||
host_type == mojom::ViewType::kExtensionSidePanel);
|
||||
- host_contents_ = WebContents::Create(
|
||||
@ -107,10 +107,10 @@ index 9c44797e9e238..b61704db987b6 100644
|
||||
+ DCHECK(browser_context);
|
||||
+ DCHECK(host_contents);
|
||||
+
|
||||
+ // Not used for panels, see PanelHost.
|
||||
+ DCHECK(host_type == mojom::ViewType::kExtensionBackgroundPage ||
|
||||
+ host_type == mojom::ViewType::kExtensionDialog ||
|
||||
+ host_type == mojom::ViewType::kExtensionPopup);
|
||||
+ host_type == mojom::ViewType::kOffscreenDocument ||
|
||||
+ host_type == mojom::ViewType::kExtensionPopup ||
|
||||
+ host_type == mojom::ViewType::kExtensionSidePanel);
|
||||
+
|
||||
+ content::WebContentsObserver::Observe(host_contents_);
|
||||
+ SetViewType(host_contents_, host_type);
|
||||
@ -132,7 +132,7 @@ index 9c44797e9e238..b61704db987b6 100644
|
||||
ExtensionRegistry::Get(browser_context_)->RemoveObserver(this);
|
||||
|
||||
diff --git extensions/browser/extension_host.h extensions/browser/extension_host.h
|
||||
index dda0620251895..4014bd801f727 100644
|
||||
index 316d778267f30..49de50e79fa37 100644
|
||||
--- extensions/browser/extension_host.h
|
||||
+++ extensions/browser/extension_host.h
|
||||
@@ -62,6 +62,12 @@ class ExtensionHost : public DeferredStartRenderHost,
|
||||
@ -157,7 +157,7 @@ index dda0620251895..4014bd801f727 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_; }
|
||||
@@ -223,7 +229,8 @@ class ExtensionHost : public DeferredStartRenderHost,
|
||||
@@ -230,7 +236,8 @@ class ExtensionHost : public DeferredStartRenderHost,
|
||||
raw_ptr<content::BrowserContext> browser_context_;
|
||||
|
||||
// The host for our HTML content.
|
||||
@ -234,10 +234,10 @@ index 058367b7ab78d..99a9e901566ce 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 580df6d9b0ae7..39b2d5ccc074c 100644
|
||||
index fcfb4635bfc23..619f210c7240e 100644
|
||||
--- extensions/browser/process_manager.cc
|
||||
+++ extensions/browser/process_manager.cc
|
||||
@@ -380,9 +380,17 @@ bool ProcessManager::CreateBackgroundHost(const Extension* extension,
|
||||
@@ -379,9 +379,17 @@ 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