Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(36)

Side by Side Diff: content/browser/frame_host/interstitial_page_impl.cc

Issue 2472253002: Fix navigation requests starting too early and not getting associated with the <webview>. (Closed)
Patch Set: nits Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/frame_host/interstitial_page_impl.h" 5 #include "content/browser/frame_host/interstitial_page_impl.h"
6 6
7 #include <utility> 7 #include <utility>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 558 matching lines...) Expand 10 before | Expand all | Expand 10 after
569 browser_context, site_instance.get())->GetDOMStorageContext()); 569 browser_context, site_instance.get())->GetDOMStorageContext());
570 session_storage_namespace_ = 570 session_storage_namespace_ =
571 new SessionStorageNamespaceImpl(dom_storage_context); 571 new SessionStorageNamespaceImpl(dom_storage_context);
572 572
573 // Use the RenderViewHost from our FrameTree. 573 // Use the RenderViewHost from our FrameTree.
574 // TODO(avi): The view routing ID can be restored to MSG_ROUTING_NONE once 574 // TODO(avi): The view routing ID can be restored to MSG_ROUTING_NONE once
575 // RenderViewHostImpl has-a RenderWidgetHostImpl. https://crbug.com/545684 575 // RenderViewHostImpl has-a RenderWidgetHostImpl. https://crbug.com/545684
576 int32_t widget_routing_id = site_instance->GetProcess()->GetNextRoutingID(); 576 int32_t widget_routing_id = site_instance->GetProcess()->GetNextRoutingID();
577 frame_tree_.root()->render_manager()->Init( 577 frame_tree_.root()->render_manager()->Init(
578 site_instance.get(), widget_routing_id, MSG_ROUTING_NONE, 578 site_instance.get(), widget_routing_id, MSG_ROUTING_NONE,
579 widget_routing_id); 579 widget_routing_id, false);
580 return frame_tree_.root()->current_frame_host()->render_view_host(); 580 return frame_tree_.root()->current_frame_host()->render_view_host();
581 } 581 }
582 582
583 WebContentsView* InterstitialPageImpl::CreateWebContentsView() { 583 WebContentsView* InterstitialPageImpl::CreateWebContentsView() {
584 if (!enabled() || !create_view_) 584 if (!enabled() || !create_view_)
585 return NULL; 585 return NULL;
586 WebContentsView* wcv = 586 WebContentsView* wcv =
587 static_cast<WebContentsImpl*>(web_contents())->GetView(); 587 static_cast<WebContentsImpl*>(web_contents())->GetView();
588 RenderWidgetHostViewBase* view = 588 RenderWidgetHostViewBase* view =
589 wcv->CreateViewForWidget(render_view_host_->GetWidget(), false); 589 wcv->CreateViewForWidget(render_view_host_->GetWidget(), false);
(...skipping 360 matching lines...) Expand 10 before | Expand all | Expand 10 after
950 void InterstitialPageImpl::UpdateDeviceScaleFactor(double device_scale_factor) { 950 void InterstitialPageImpl::UpdateDeviceScaleFactor(double device_scale_factor) {
951 WebContentsImpl* web_contents_impl = 951 WebContentsImpl* web_contents_impl =
952 static_cast<WebContentsImpl*>(web_contents_); 952 static_cast<WebContentsImpl*>(web_contents_);
953 if (!web_contents_impl) 953 if (!web_contents_impl)
954 return; 954 return;
955 955
956 web_contents_impl->UpdateDeviceScaleFactor(device_scale_factor); 956 web_contents_impl->UpdateDeviceScaleFactor(device_scale_factor);
957 } 957 }
958 958
959 } // namespace content 959 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/frame_host/frame_tree_node.cc ('k') | content/browser/frame_host/render_frame_host_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698