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

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

Issue 7618016: Additional fixes for prerender/instant + browsing history. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Wrong signature Created 9 years, 4 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_final_status.h" 5 #include "chrome/browser/prerender/prerender_final_status.h"
6 6
7 #include "chrome/browser/prerender/prerender_manager.h" 7 #include "chrome/browser/prerender/prerender_manager.h"
8 8
9 namespace prerender { 9 namespace prerender {
10 10
(...skipping 27 matching lines...) Expand all
38 "window.print", 38 "window.print",
39 "Recently Visited", 39 "Recently Visited",
40 "window.opener", 40 "window.opener",
41 "Page ID Conflict", 41 "Page ID Conflict",
42 "Safe Browsing", 42 "Safe Browsing",
43 "Fragment Mismatch", 43 "Fragment Mismatch",
44 "SSL Client Certificate Requested", 44 "SSL Client Certificate Requested",
45 "Cache or History Cleared", 45 "Cache or History Cleared",
46 "Cancelled", 46 "Cancelled",
47 "SSL Error", 47 "SSL Error",
48 "Cross-Site Navigation Pending",
48 "Max", 49 "Max",
49 }; 50 };
50 COMPILE_ASSERT(arraysize(kFinalStatusNames) == FINAL_STATUS_MAX + 1, 51 COMPILE_ASSERT(arraysize(kFinalStatusNames) == FINAL_STATUS_MAX + 1,
51 PrerenderFinalStatus_name_count_mismatch); 52 PrerenderFinalStatus_name_count_mismatch);
52 53
53 } 54 }
54 55
55 const char* NameFromFinalStatus(FinalStatus final_status) { 56 const char* NameFromFinalStatus(FinalStatus final_status) {
56 DCHECK(static_cast<int>(final_status) >= 0 && 57 DCHECK(static_cast<int>(final_status) >= 0 &&
57 static_cast<int>(final_status) <= FINAL_STATUS_MAX); 58 static_cast<int>(final_status) <= FINAL_STATUS_MAX);
58 return kFinalStatusNames[final_status]; 59 return kFinalStatusNames[final_status];
59 } 60 }
60 61
61 } // namespace prerender 62 } // namespace prerender
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698