Chromium Code Reviews| Index: chrome/browser/prerender/prerender_contents.cc |
| =================================================================== |
| --- chrome/browser/prerender/prerender_contents.cc (revision 72357) |
| +++ chrome/browser/prerender/prerender_contents.cc (working copy) |
| @@ -28,7 +28,8 @@ |
| render_view_host_(NULL), |
| prerender_url_(url), |
| profile_(profile), |
| - page_id_(0) { |
| + page_id_(0), |
| + has_stopped_loading_(false) { |
| DCHECK(prerender_manager != NULL); |
| AddAliasURL(prerender_url_); |
| for (std::vector<GURL>::const_iterator it = alias_urls.begin(); |
| @@ -123,6 +124,8 @@ |
| IPC::Message* reply_msg, |
| bool* did_suppress_message) { |
| *did_suppress_message = true; |
| + // Cancel prerendering, since we do cannot deal with a pop up message. |
| + prerender_manager_->RemoveEntry(this); |
|
cbentzel
2011/01/26 19:38:36
Move this to a different CL.
tburkard
2011/01/26 20:05:50
Done.
|
| } |
| bool PrerenderContents::PreHandleKeyboardEvent( |
| @@ -265,3 +268,7 @@ |
| return std::find(alias_urls_.begin(), alias_urls_.end(), url) |
| != alias_urls_.end(); |
| } |
| + |
| +void PrerenderContents::DidStopLoading() { |
|
cbentzel
2011/01/26 19:38:36
DCHECK(has_stopped_loading_) - can this ever be ca
tburkard
2011/01/26 20:05:50
Could happen multiple times.
In some pages, the lo
|
| + has_stopped_loading_ = true; |
| +} |