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

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

Issue 6915019: Changes to not use the prerendered contents when window.opener needs to be set. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Synced for Commit. Created 9 years, 7 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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_render_view_host_observer.h" 5 #include "chrome/browser/prerender/prerender_render_view_host_observer.h"
6 6
7 #include "chrome/browser/prerender/prerender_contents.h" 7 #include "chrome/browser/prerender/prerender_contents.h"
8 #include "chrome/common/icon_messages.h" 8 #include "chrome/common/icon_messages.h"
9 #include "chrome/common/render_messages.h" 9 #include "chrome/common/render_messages.h"
10 #include "content/common/view_messages.h" 10 #include "content/common/view_messages.h"
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 } 79 }
80 80
81 void PrerenderRenderViewHostObserver::OnRenderViewGone(int status, 81 void PrerenderRenderViewHostObserver::OnRenderViewGone(int status,
82 int exit_code) { 82 int exit_code) {
83 prerender_contents_->OnRenderViewGone(status, exit_code); 83 prerender_contents_->OnRenderViewGone(status, exit_code);
84 } 84 }
85 85
86 void PrerenderRenderViewHostObserver::OnDidStartProvisionalLoadForFrame( 86 void PrerenderRenderViewHostObserver::OnDidStartProvisionalLoadForFrame(
87 int64 frame_id, 87 int64 frame_id,
88 bool is_main_frame, 88 bool is_main_frame,
89 bool has_opener_set,
89 const GURL& url) { 90 const GURL& url) {
90 prerender_contents_->OnDidStartProvisionalLoadForFrame(frame_id, 91 prerender_contents_->OnDidStartProvisionalLoadForFrame(frame_id,
91 is_main_frame, 92 is_main_frame,
93 has_opener_set,
92 url); 94 url);
93 } 95 }
94 96
95 void PrerenderRenderViewHostObserver::OnUpdateFaviconURL( 97 void PrerenderRenderViewHostObserver::OnUpdateFaviconURL(
96 int32 page_id, 98 int32 page_id,
97 const std::vector<FaviconURL>& urls) { 99 const std::vector<FaviconURL>& urls) {
98 prerender_contents_->OnUpdateFaviconURL(page_id, urls); 100 prerender_contents_->OnUpdateFaviconURL(page_id, urls);
99 } 101 }
100 102
101 void PrerenderRenderViewHostObserver::OnMaybeCancelPrerenderForHTML5Media() { 103 void PrerenderRenderViewHostObserver::OnMaybeCancelPrerenderForHTML5Media() {
102 prerender_contents_->Destroy(FINAL_STATUS_HTML5_MEDIA); 104 prerender_contents_->Destroy(FINAL_STATUS_HTML5_MEDIA);
103 } 105 }
104 106
105 void PrerenderRenderViewHostObserver::OnCancelPrerenderForPrinting() { 107 void PrerenderRenderViewHostObserver::OnCancelPrerenderForPrinting() {
106 prerender_contents_->Destroy(FINAL_STATUS_WINDOW_PRINT); 108 prerender_contents_->Destroy(FINAL_STATUS_WINDOW_PRINT);
107 } 109 }
108 110
109 } 111 }
OLDNEW
« no previous file with comments | « chrome/browser/prerender/prerender_render_view_host_observer.h ('k') | chrome/test/data/prerender/prerender_loader.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698