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

Side by Side Diff: ui/base/page_transition_types.cc

Issue 1340683002: Remove base's implicit_cast. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: implicitcast: numericstest Created 5 years, 3 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
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 "ui/base/page_transition_types.h" 5 #include "ui/base/page_transition_types.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 8
9 namespace ui { 9 namespace ui {
10 10
11 bool PageTransitionCoreTypeIs(PageTransition lhs, 11 bool PageTransitionCoreTypeIs(PageTransition lhs,
12 PageTransition rhs) { 12 PageTransition rhs) {
13 // Expect the rhs to be a compile time constant without qualifiers. 13 // Expect the rhs to be a compile time constant without qualifiers.
14 DCHECK(PageTransitionGetQualifier(rhs) == 0 && 14 DCHECK_EQ(PageTransitionGetQualifier(rhs), 0);
15 PageTransitionIsValidType(rhs)); 15 DCHECK(PageTransitionIsValidType(rhs));
16 return implicit_cast<int>(PageTransitionStripQualifier(lhs)) == 16 return PageTransitionStripQualifier(lhs) == PageTransitionStripQualifier(rhs);
17 implicit_cast<int>(PageTransitionStripQualifier(rhs));
18 } 17 }
19 18
20 PageTransition PageTransitionStripQualifier(PageTransition type) { 19 PageTransition PageTransitionStripQualifier(PageTransition type) {
21 return static_cast<PageTransition>(type & ~PAGE_TRANSITION_QUALIFIER_MASK); 20 return static_cast<PageTransition>(type & ~PAGE_TRANSITION_QUALIFIER_MASK);
22 } 21 }
23 22
24 bool PageTransitionIsValidType(int32 type) { 23 bool PageTransitionIsValidType(int32 type) {
25 PageTransition t = PageTransitionStripQualifier( 24 PageTransition t = PageTransitionStripQualifier(
26 static_cast<PageTransition>(type)); 25 static_cast<PageTransition>(type));
27 return (t <= PAGE_TRANSITION_LAST_CORE); 26 return (t <= PAGE_TRANSITION_LAST_CORE);
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 case PAGE_TRANSITION_AUTO_TOPLEVEL: return "auto_toplevel"; 79 case PAGE_TRANSITION_AUTO_TOPLEVEL: return "auto_toplevel";
81 case PAGE_TRANSITION_FORM_SUBMIT: return "form_submit"; 80 case PAGE_TRANSITION_FORM_SUBMIT: return "form_submit";
82 case PAGE_TRANSITION_RELOAD: return "reload"; 81 case PAGE_TRANSITION_RELOAD: return "reload";
83 case PAGE_TRANSITION_KEYWORD: return "keyword"; 82 case PAGE_TRANSITION_KEYWORD: return "keyword";
84 case PAGE_TRANSITION_KEYWORD_GENERATED: return "keyword_generated"; 83 case PAGE_TRANSITION_KEYWORD_GENERATED: return "keyword_generated";
85 } 84 }
86 return NULL; 85 return NULL;
87 } 86 }
88 87
89 } // namespace ui 88 } // namespace ui
OLDNEW
« no previous file with comments | « net/tools/quic/quic_client_session_test.cc ('k') | ui/views/style/mac/dialog_button_border_mac_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698