mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 70.0.3507.0 (#578961)
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
diff --git content/browser/browser_plugin/browser_plugin_guest.cc content/browser/browser_plugin/browser_plugin_guest.cc
|
||||
index f56ce93c3d5b..716cf8846378 100644
|
||||
index ca19df7c7fa2..99f7f9c950db 100644
|
||||
--- content/browser/browser_plugin/browser_plugin_guest.cc
|
||||
+++ content/browser/browser_plugin/browser_plugin_guest.cc
|
||||
@@ -312,8 +312,11 @@ void BrowserPluginGuest::InitInternal(
|
||||
@@ -37,7 +37,7 @@ index f56ce93c3d5b..716cf8846378 100644
|
||||
|
||||
attached_ = true;
|
||||
diff --git content/browser/frame_host/interstitial_page_impl.cc content/browser/frame_host/interstitial_page_impl.cc
|
||||
index f839f62061bb..2150ceb6c780 100644
|
||||
index 04922e2a61bf..c4fd3f9a050e 100644
|
||||
--- content/browser/frame_host/interstitial_page_impl.cc
|
||||
+++ content/browser/frame_host/interstitial_page_impl.cc
|
||||
@@ -619,7 +619,7 @@ WebContentsView* InterstitialPageImpl::CreateWebContentsView() {
|
||||
@@ -208,10 +208,10 @@ index 9e3511a9dabc..83dfee968d59 100644
|
||||
RenderWidgetHost* render_widget_host) override;
|
||||
void SetPageTitle(const base::string16& title) override;
|
||||
diff --git content/browser/web_contents/web_contents_view_mac.h content/browser/web_contents/web_contents_view_mac.h
|
||||
index 2e3f4f8a56d4..75ef26b5381a 100644
|
||||
index 7f80c1b1d829..bcbd04bc4e6c 100644
|
||||
--- content/browser/web_contents/web_contents_view_mac.h
|
||||
+++ content/browser/web_contents/web_contents_view_mac.h
|
||||
@@ -96,7 +96,7 @@ class WebContentsViewMac : public WebContentsView,
|
||||
@@ -97,7 +97,7 @@ class WebContentsViewMac : public WebContentsView,
|
||||
gfx::NativeView context) override;
|
||||
RenderWidgetHostViewBase* CreateViewForWidget(
|
||||
RenderWidgetHost* render_widget_host,
|
||||
@@ -221,7 +221,7 @@ index 2e3f4f8a56d4..75ef26b5381a 100644
|
||||
RenderWidgetHost* render_widget_host) override;
|
||||
void SetPageTitle(const base::string16& title) override;
|
||||
diff --git content/browser/web_contents/web_contents_view_mac.mm content/browser/web_contents/web_contents_view_mac.mm
|
||||
index 03d7c9c7dcce..e84c1787a84d 100644
|
||||
index 94848b568363..4dea19adb512 100644
|
||||
--- content/browser/web_contents/web_contents_view_mac.mm
|
||||
+++ content/browser/web_contents/web_contents_view_mac.mm
|
||||
@@ -345,7 +345,8 @@ void WebContentsViewMac::CreateView(
|
||||
@@ -266,7 +266,7 @@ index d05dd5421458..fa13775f0512 100644
|
||||
// a BrowserPlugin even when we are using cross process frames for guests. It
|
||||
// should be removed after resolving https://crbug.com/642826).
|
||||
diff --git extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc
|
||||
index 1930af130f24..77695f7844d7 100644
|
||||
index 68d48f12192d..fb713dbda108 100644
|
||||
--- extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc
|
||||
+++ extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc
|
||||
@@ -198,6 +198,8 @@ void MimeHandlerViewGuest::CreateWebContents(
|
||||
|
Reference in New Issue
Block a user