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: chrome/browser/prerender/prerender_contents.cc

Issue 10805051: Add RenderViewHost* to DidStartLoading and DidStopLoading in (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 5 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 | Annotate | Revision Log
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 "chrome/browser/prerender/prerender_contents.h" 5 #include "chrome/browser/prerender/prerender_contents.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <functional> 8 #include <functional>
9 #include <utility> 9 #include <utility>
10 10
(...skipping 548 matching lines...) Expand 10 before | Expand all | Expand 10 after
559 session_storage_namespace_id_ != session_storage_namespace->id()) 559 session_storage_namespace_id_ != session_storage_namespace->id())
560 return false; 560 return false;
561 return std::count_if(alias_urls_.begin(), alias_urls_.end(), 561 return std::count_if(alias_urls_.begin(), alias_urls_.end(),
562 std::bind2nd(std::equal_to<GURL>(), url)) != 0; 562 std::bind2nd(std::equal_to<GURL>(), url)) != 0;
563 } 563 }
564 564
565 void PrerenderContents::RenderViewGone(base::TerminationStatus status) { 565 void PrerenderContents::RenderViewGone(base::TerminationStatus status) {
566 Destroy(FINAL_STATUS_RENDERER_CRASHED); 566 Destroy(FINAL_STATUS_RENDERER_CRASHED);
567 } 567 }
568 568
569 void PrerenderContents::DidStopLoading() { 569 void PrerenderContents::DidStopLoading(
570 content::RenderViewHost* render_view_host) {
570 has_stopped_loading_ = true; 571 has_stopped_loading_ = true;
571 } 572 }
572 573
573 void PrerenderContents::DidStartProvisionalLoadForFrame( 574 void PrerenderContents::DidStartProvisionalLoadForFrame(
574 int64 frame_id, 575 int64 frame_id,
575 bool is_main_frame, 576 bool is_main_frame,
576 const GURL& validated_url, 577 const GURL& validated_url,
577 bool is_error_page, 578 bool is_error_page,
578 RenderViewHost* render_view_host) { 579 RenderViewHost* render_view_host) {
579 if (is_main_frame) { 580 if (is_main_frame) {
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
706 bool PrerenderContents::IsCrossSiteNavigationPending() const { 707 bool PrerenderContents::IsCrossSiteNavigationPending() const {
707 if (!prerender_contents_.get() || !prerender_contents_->web_contents()) 708 if (!prerender_contents_.get() || !prerender_contents_->web_contents())
708 return false; 709 return false;
709 const WebContents* web_contents = prerender_contents_->web_contents(); 710 const WebContents* web_contents = prerender_contents_->web_contents();
710 return (web_contents->GetSiteInstance() != 711 return (web_contents->GetSiteInstance() !=
711 web_contents->GetPendingSiteInstance()); 712 web_contents->GetPendingSiteInstance());
712 } 713 }
713 714
714 715
715 } // namespace prerender 716 } // namespace prerender
OLDNEW
« no previous file with comments | « chrome/browser/prerender/prerender_contents.h ('k') | chrome/browser/prerender/prerender_tab_helper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698