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

Side by Side Diff: chrome/browser/prerender/prerender_contents.cc

Issue 18339006: Rename RenderViewGone IPC/methods to better reflect reality (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixes for reviews by creis@ and palmer@. Created 7 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 541 matching lines...) Expand 10 before | Expand all | Expand 10 after
552 const GURL& url, 552 const GURL& url,
553 const SessionStorageNamespace* session_storage_namespace) const { 553 const SessionStorageNamespace* session_storage_namespace) const {
554 if (session_storage_namespace && 554 if (session_storage_namespace &&
555 session_storage_namespace_id_ != session_storage_namespace->id()) { 555 session_storage_namespace_id_ != session_storage_namespace->id()) {
556 return false; 556 return false;
557 } 557 }
558 return std::count_if(alias_urls_.begin(), alias_urls_.end(), 558 return std::count_if(alias_urls_.begin(), alias_urls_.end(),
559 std::bind2nd(std::equal_to<GURL>(), url)) != 0; 559 std::bind2nd(std::equal_to<GURL>(), url)) != 0;
560 } 560 }
561 561
562 void PrerenderContents::RenderViewGone(base::TerminationStatus status) { 562 void PrerenderContents::RenderProcessGone(base::TerminationStatus status) {
563 Destroy(FINAL_STATUS_RENDERER_CRASHED); 563 Destroy(FINAL_STATUS_RENDERER_CRASHED);
564 } 564 }
565 565
566 void PrerenderContents::DidStopLoading( 566 void PrerenderContents::DidStopLoading(
567 content::RenderViewHost* render_view_host) { 567 content::RenderViewHost* render_view_host) {
568 has_stopped_loading_ = true; 568 has_stopped_loading_ = true;
569 NotifyPrerenderStopLoading(); 569 NotifyPrerenderStopLoading();
570 } 570 }
571 571
572 void PrerenderContents::DidStartProvisionalLoadForFrame( 572 void PrerenderContents::DidStartProvisionalLoadForFrame(
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
715 715
716 bool PrerenderContents::IsCrossSiteNavigationPending() const { 716 bool PrerenderContents::IsCrossSiteNavigationPending() const {
717 if (!prerender_contents_) 717 if (!prerender_contents_)
718 return false; 718 return false;
719 return (prerender_contents_->GetSiteInstance() != 719 return (prerender_contents_->GetSiteInstance() !=
720 prerender_contents_->GetPendingSiteInstance()); 720 prerender_contents_->GetPendingSiteInstance());
721 } 721 }
722 722
723 723
724 } // namespace prerender 724 } // namespace prerender
OLDNEW
« no previous file with comments | « chrome/browser/prerender/prerender_contents.h ('k') | chrome/browser/printing/print_view_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698