Update to Chromium version 69.0.3489.0 (#574445)

This commit is contained in:
Marshall Greenblatt
2018-07-13 15:29:20 -04:00
parent 8e9d736cda
commit 96bd993d99
39 changed files with 270 additions and 387 deletions

View File

@@ -1,8 +1,8 @@
diff --git content/browser/web_contents/web_contents_impl.cc content/browser/web_contents/web_contents_impl.cc
index 34096176fc16..58eabafbd9b6 100644
index 58eedf0d0bd8..b51742b98834 100644
--- content/browser/web_contents/web_contents_impl.cc
+++ content/browser/web_contents/web_contents_impl.cc
@@ -2006,21 +2006,30 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
@@ -2033,21 +2033,30 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
std::string unique_name;
frame_tree_.root()->SetFrameName(params.main_frame_name, unique_name);
@@ -45,7 +45,7 @@ index 34096176fc16..58eabafbd9b6 100644
CHECK(render_view_host_delegate_view_);
CHECK(view_.get());
@@ -2703,6 +2712,15 @@ void WebContentsImpl::CreateNewWindow(
@@ -2730,6 +2739,15 @@ void WebContentsImpl::CreateNewWindow(
create_params.renderer_initiated_creation =
main_frame_route_id != MSG_ROUTING_NONE;
@@ -61,7 +61,7 @@ index 34096176fc16..58eabafbd9b6 100644
std::unique_ptr<WebContents> new_contents;
if (!is_guest) {
create_params.context = view_->GetNativeView();
@@ -2733,7 +2751,7 @@ void WebContentsImpl::CreateNewWindow(
@@ -2760,7 +2778,7 @@ void WebContentsImpl::CreateNewWindow(
// TODO(brettw): It seems bogus that we have to call this function on the
// newly created object and give it one of its own member variables.
new_view->CreateViewForWidget(
@@ -70,7 +70,7 @@ index 34096176fc16..58eabafbd9b6 100644
}
// Save the created window associated with the route so we can show it
// later.
@@ -6066,7 +6084,7 @@ InterstitialPageImpl* WebContentsImpl::GetInterstitialForRenderManager() {
@@ -6092,7 +6110,7 @@ InterstitialPageImpl* WebContentsImpl::GetInterstitialForRenderManager() {
void WebContentsImpl::CreateRenderWidgetHostViewForRenderManager(
RenderViewHost* render_view_host) {
RenderWidgetHostViewBase* rwh_view =