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

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 3842 matching lines...) Expand 10 before | Expand all | Expand 10 after
3853 // as it is deprecated and can be out of sync with GetRenderViewHost(). 3853 // as it is deprecated and can be out of sync with GetRenderViewHost().
3854 GURL url = controller_.GetActiveEntry() 3854 GURL url = controller_.GetActiveEntry()
3855 ? controller_.GetActiveEntry()->GetURL() : GURL::EmptyGURL(); 3855 ? controller_.GetActiveEntry()->GetURL() : GURL::EmptyGURL();
3856 3856
3857 return GetRenderManager()->current_host()->GetWebkitPrefs(url); 3857 return GetRenderManager()->current_host()->GetWebkitPrefs(url);
3858 } 3858 }
3859 3859
3860 int WebContentsImpl::CreateSwappedOutRenderView( 3860 int WebContentsImpl::CreateSwappedOutRenderView(
3861 SiteInstance* instance) { 3861 SiteInstance* instance) {
3862 return GetRenderManager()->CreateRenderFrame(instance, MSG_ROUTING_NONE, 3862 return GetRenderManager()->CreateRenderFrame(instance, MSG_ROUTING_NONE,
3863 true, true); 3863 true, true, false);
3864 } 3864 }
3865 3865
3866 void WebContentsImpl::OnUserGesture() { 3866 void WebContentsImpl::OnUserGesture() {
3867 // Notify observers. 3867 // Notify observers.
3868 FOR_EACH_OBSERVER(WebContentsObserver, observers_, DidGetUserGesture()); 3868 FOR_EACH_OBSERVER(WebContentsObserver, observers_, DidGetUserGesture());
3869 3869
3870 ResourceDispatcherHostImpl* rdh = ResourceDispatcherHostImpl::Get(); 3870 ResourceDispatcherHostImpl* rdh = ResourceDispatcherHostImpl::Get();
3871 if (rdh) // NULL in unittests. 3871 if (rdh) // NULL in unittests.
3872 rdh->OnUserGesture(this); 3872 rdh->OnUserGesture(this);
3873 } 3873 }
(...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after
4024 return GetRenderManager()->pending_render_view_host()->GetRoutingID(); 4024 return GetRenderManager()->pending_render_view_host()->GetRoutingID();
4025 4025
4026 RenderViewHostImpl* rvh = GetRenderManager()->GetSwappedOutRenderViewHost( 4026 RenderViewHostImpl* rvh = GetRenderManager()->GetSwappedOutRenderViewHost(
4027 instance); 4027 instance);
4028 if (rvh) 4028 if (rvh)
4029 return rvh->GetRoutingID(); 4029 return rvh->GetRoutingID();
4030 4030
4031 // Create a swapped out RenderView in the given SiteInstance if none exists, 4031 // Create a swapped out RenderView in the given SiteInstance if none exists,
4032 // setting its opener to the given route_id. Return the new view's route_id. 4032 // setting its opener to the given route_id. Return the new view's route_id.
4033 return GetRenderManager()->CreateRenderFrame(instance, opener_route_id, 4033 return GetRenderManager()->CreateRenderFrame(instance, opener_route_id,
4034 true, true); 4034 true, true, false);
4035 } 4035 }
4036 4036
4037 NavigationControllerImpl& WebContentsImpl::GetControllerForRenderManager() { 4037 NavigationControllerImpl& WebContentsImpl::GetControllerForRenderManager() {
4038 return GetController(); 4038 return GetController();
4039 } 4039 }
4040 4040
4041 WebUIImpl* WebContentsImpl::CreateWebUIForRenderManager(const GURL& url) { 4041 WebUIImpl* WebContentsImpl::CreateWebUIForRenderManager(const GURL& url) {
4042 return static_cast<WebUIImpl*>(CreateWebUI(url)); 4042 return static_cast<WebUIImpl*>(CreateWebUI(url));
4043 } 4043 }
4044 4044
(...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after
4245 if (new_size != old_size) 4245 if (new_size != old_size)
4246 delegate_->UpdatePreferredSize(this, new_size); 4246 delegate_->UpdatePreferredSize(this, new_size);
4247 } 4247 }
4248 4248
4249 void WebContentsImpl::ResumeResponseDeferredAtStart() { 4249 void WebContentsImpl::ResumeResponseDeferredAtStart() {
4250 FrameTreeNode* node = frame_tree_.root(); 4250 FrameTreeNode* node = frame_tree_.root();
4251 node->render_manager()->ResumeResponseDeferredAtStart(); 4251 node->render_manager()->ResumeResponseDeferredAtStart();
4252 } 4252 }
4253 4253
4254 } // namespace content 4254 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698