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

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

Issue 815363002: replace COMPILE_ASSERT with static_assert in chrome/browser/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address comments Created 6 years 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
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_link_manager.h" 5 #include "chrome/browser/prerender/prerender_link_manager.h"
6 6
7 #include <functional> 7 #include <functional>
8 #include <limits> 8 #include <limits>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 53
54 if (rel_types & PrerenderRelTypePrerender) { 54 if (rel_types & PrerenderRelTypePrerender) {
55 return true; 55 return true;
56 } else if (should_start_rel_next_prerenders && 56 } else if (should_start_rel_next_prerenders &&
57 (rel_types & PrerenderRelTypeNext) == PrerenderRelTypeNext) { 57 (rel_types & PrerenderRelTypeNext) == PrerenderRelTypeNext) {
58 return true; 58 return true;
59 } 59 }
60 return false; 60 return false;
61 } 61 }
62 62
63 COMPILE_ASSERT(PrerenderRelTypePrerender == 0x1, 63 static_assert(PrerenderRelTypePrerender == 0x1,
64 RelTypeHistogramEnum_must_match_PrerenderRelType); 64 "RelTypeHistogrameEnum must match PrerenderRelType");
65 COMPILE_ASSERT(PrerenderRelTypeNext == 0x2, 65 static_assert(PrerenderRelTypeNext == 0x2,
66 RelTypeHistogramEnum_must_match_PrerenderRelType); 66 "RelTypeHistogramEnum must match PrerenderRelType");
67 enum RelTypeHistogramEnum { 67 enum RelTypeHistogramEnum {
68 RelTypeHistogramEnumNone = 0, 68 RelTypeHistogramEnumNone = 0,
69 RelTypeHistogramEnumPrerender = PrerenderRelTypePrerender, 69 RelTypeHistogramEnumPrerender = PrerenderRelTypePrerender,
70 RelTypeHistogramEnumNext = PrerenderRelTypeNext, 70 RelTypeHistogramEnumNext = PrerenderRelTypeNext,
71 RelTypeHistogramEnumPrerenderAndNext = 71 RelTypeHistogramEnumPrerenderAndNext =
72 PrerenderRelTypePrerender | PrerenderRelTypeNext, 72 PrerenderRelTypePrerender | PrerenderRelTypeNext,
73 RelTypeHistogramEnumMax, 73 RelTypeHistogramEnumMax,
74 }; 74 };
75 75
76 void RecordLinkManagerAdded(const uint32 rel_types) { 76 void RecordLinkManagerAdded(const uint32 rel_types) {
(...skipping 463 matching lines...) Expand 10 before | Expand all | Expand 10 after
540 DCHECK(!prerender->is_match_complete_replacement); 540 DCHECK(!prerender->is_match_complete_replacement);
541 prerender->is_match_complete_replacement = true; 541 prerender->is_match_complete_replacement = true;
542 Send(prerender->launcher_child_id, 542 Send(prerender->launcher_child_id,
543 new PrerenderMsg_OnPrerenderStop(prerender->prerender_id)); 543 new PrerenderMsg_OnPrerenderStop(prerender->prerender_id));
544 // Do not call RemovePrerender here. The replacement needs to stay connected 544 // Do not call RemovePrerender here. The replacement needs to stay connected
545 // to the HTMLLinkElement in the renderer so it notices renderer-triggered 545 // to the HTMLLinkElement in the renderer so it notices renderer-triggered
546 // cancelations. 546 // cancelations.
547 } 547 }
548 548
549 } // namespace prerender 549 } // namespace prerender
OLDNEW
« no previous file with comments | « chrome/browser/prerender/prerender_final_status.cc ('k') | chrome/browser/prerender/prerender_local_predictor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698