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

Side by Side Diff: content/browser/web_contents/web_contents_impl.cc

Issue 379143002: PlzNavigate: implement RequestNavigation in the no live renderer case (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed Charlie's comments Created 6 years, 4 months 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/web_contents/web_contents_impl.h" 5 #include "content/browser/web_contents/web_contents_impl.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/debug/trace_event.h" 10 #include "base/debug/trace_event.h"
(...skipping 3833 matching lines...) Expand 10 before | Expand all | Expand 10 after
3844 // as it is deprecated and can be out of sync with GetRenderViewHost(). 3844 // as it is deprecated and can be out of sync with GetRenderViewHost().
3845 GURL url = controller_.GetActiveEntry() 3845 GURL url = controller_.GetActiveEntry()
3846 ? controller_.GetActiveEntry()->GetURL() : GURL::EmptyGURL(); 3846 ? controller_.GetActiveEntry()->GetURL() : GURL::EmptyGURL();
3847 3847
3848 return GetRenderManager()->current_host()->ComputeWebkitPrefs(url); 3848 return GetRenderManager()->current_host()->ComputeWebkitPrefs(url);
3849 } 3849 }
3850 3850
3851 int WebContentsImpl::CreateSwappedOutRenderView( 3851 int WebContentsImpl::CreateSwappedOutRenderView(
3852 SiteInstance* instance) { 3852 SiteInstance* instance) {
3853 return GetRenderManager()->CreateRenderFrame(instance, MSG_ROUTING_NONE, 3853 return GetRenderManager()->CreateRenderFrame(instance, MSG_ROUTING_NONE,
3854 true, true); 3854 true, true, false);
3855 } 3855 }
3856 3856
3857 void WebContentsImpl::OnUserGesture() { 3857 void WebContentsImpl::OnUserGesture() {
3858 // Notify observers. 3858 // Notify observers.
3859 FOR_EACH_OBSERVER(WebContentsObserver, observers_, DidGetUserGesture()); 3859 FOR_EACH_OBSERVER(WebContentsObserver, observers_, DidGetUserGesture());
3860 3860
3861 ResourceDispatcherHostImpl* rdh = ResourceDispatcherHostImpl::Get(); 3861 ResourceDispatcherHostImpl* rdh = ResourceDispatcherHostImpl::Get();
3862 if (rdh) // NULL in unittests. 3862 if (rdh) // NULL in unittests.
3863 rdh->OnUserGesture(this); 3863 rdh->OnUserGesture(this);
3864 } 3864 }
(...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after
4015 return GetRenderManager()->pending_render_view_host()->GetRoutingID(); 4015 return GetRenderManager()->pending_render_view_host()->GetRoutingID();
4016 4016
4017 RenderViewHostImpl* rvh = GetRenderManager()->GetSwappedOutRenderViewHost( 4017 RenderViewHostImpl* rvh = GetRenderManager()->GetSwappedOutRenderViewHost(
4018 instance); 4018 instance);
4019 if (rvh) 4019 if (rvh)
4020 return rvh->GetRoutingID(); 4020 return rvh->GetRoutingID();
4021 4021
4022 // Create a swapped out RenderView in the given SiteInstance if none exists, 4022 // Create a swapped out RenderView in the given SiteInstance if none exists,
4023 // setting its opener to the given route_id. Return the new view's route_id. 4023 // setting its opener to the given route_id. Return the new view's route_id.
4024 return GetRenderManager()->CreateRenderFrame(instance, opener_route_id, 4024 return GetRenderManager()->CreateRenderFrame(instance, opener_route_id,
4025 true, true); 4025 true, true, false);
4026 } 4026 }
4027 4027
4028 NavigationControllerImpl& WebContentsImpl::GetControllerForRenderManager() { 4028 NavigationControllerImpl& WebContentsImpl::GetControllerForRenderManager() {
4029 return GetController(); 4029 return GetController();
4030 } 4030 }
4031 4031
4032 WebUIImpl* WebContentsImpl::CreateWebUIForRenderManager(const GURL& url) { 4032 WebUIImpl* WebContentsImpl::CreateWebUIForRenderManager(const GURL& url) {
4033 return static_cast<WebUIImpl*>(CreateWebUI(url)); 4033 return static_cast<WebUIImpl*>(CreateWebUI(url));
4034 } 4034 }
4035 4035
(...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after
4236 if (new_size != old_size) 4236 if (new_size != old_size)
4237 delegate_->UpdatePreferredSize(this, new_size); 4237 delegate_->UpdatePreferredSize(this, new_size);
4238 } 4238 }
4239 4239
4240 void WebContentsImpl::ResumeResponseDeferredAtStart() { 4240 void WebContentsImpl::ResumeResponseDeferredAtStart() {
4241 FrameTreeNode* node = frame_tree_.root(); 4241 FrameTreeNode* node = frame_tree_.root();
4242 node->render_manager()->ResumeResponseDeferredAtStart(); 4242 node->render_manager()->ResumeResponseDeferredAtStart();
4243 } 4243 }
4244 4244
4245 } // namespace content 4245 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698