Chromium Code Reviews| Index: chrome/browser/prerender/prerender_contents.cc |
| =================================================================== |
| --- chrome/browser/prerender/prerender_contents.cc (revision 109293) |
| +++ chrome/browser/prerender/prerender_contents.cc (working copy) |
| @@ -349,11 +349,13 @@ |
| void PrerenderContents::set_final_status(FinalStatus final_status) { |
| DCHECK(final_status >= FINAL_STATUS_USED && final_status < FINAL_STATUS_MAX); |
| DCHECK(final_status_ == FINAL_STATUS_MAX || |
| - final_status_ == FINAL_STATUS_CONTROL_GROUP); |
| + final_status_ == FINAL_STATUS_CONTROL_GROUP || |
| + final_status_ == FINAL_STATUS_MATCH_COMPLETE_DUMMY); |
| // Don't override final_status_ if it's FINAL_STATUS_CONTROL_GROUP, |
|
cbentzel
2011/11/10 13:16:25
Update comment.
tburkard
2011/11/10 18:36:55
Done.
|
| // otherwise data will be collected in the Prerender.FinalStatus histogram. |
| - if (final_status_ == FINAL_STATUS_CONTROL_GROUP) |
| + if (final_status_ == FINAL_STATUS_CONTROL_GROUP || |
| + final_status_ == FINAL_STATUS_MATCH_COMPLETE_DUMMY) |
| return; |
| final_status_ = final_status; |
| @@ -579,7 +581,7 @@ |
| prerendering_has_been_cancelled_ = true; |
| // This has to be done after setting the final status, as it adds the |
| // prerender to the history. |
| - prerender_manager_->MoveEntryToPendingDelete(this); |
| + prerender_manager_->MoveEntryToPendingDelete(this, final_status); |
| // We may destroy the PrerenderContents before we have initialized the |
| // RenderViewHost. Otherwise set the Observer's PrerenderContents to NULL to |