| OLD | NEW |
| 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 #ifndef UI_BASE_PAGE_TRANSITION_TYPES_H_ | 5 #ifndef UI_BASE_PAGE_TRANSITION_TYPES_H_ |
| 6 #define UI_BASE_PAGE_TRANSITION_TYPES_H_ | 6 #define UI_BASE_PAGE_TRANSITION_TYPES_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include "ui/base/ui_base_export.h" | 10 #include "ui/base/ui_base_export.h" |
| (...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 93 // url 'http://' + keyword. For example, if you do a tab-to-search against | 93 // url 'http://' + keyword. For example, if you do a tab-to-search against |
| 94 // wikipedia the generated url has a transition qualifer of KEYWORD, and | 94 // wikipedia the generated url has a transition qualifer of KEYWORD, and |
| 95 // TemplateURLModel generates a visit for 'wikipedia.org' with a transition | 95 // TemplateURLModel generates a visit for 'wikipedia.org' with a transition |
| 96 // type of KEYWORD_GENERATED. | 96 // type of KEYWORD_GENERATED. |
| 97 PAGE_TRANSITION_KEYWORD = 9, | 97 PAGE_TRANSITION_KEYWORD = 9, |
| 98 | 98 |
| 99 // Corresponds to a visit generated for a keyword. See description of | 99 // Corresponds to a visit generated for a keyword. See description of |
| 100 // KEYWORD for more details. | 100 // KEYWORD for more details. |
| 101 PAGE_TRANSITION_KEYWORD_GENERATED = 10, | 101 PAGE_TRANSITION_KEYWORD_GENERATED = 10, |
| 102 | 102 |
| 103 // Corresponds to a visit generated for a keyword. See description of |
| 104 // KEYWORD for more details. |
| 105 PAGE_TRANSITION_READING_LIST = 11, |
| 106 |
| 103 // ADDING NEW CORE VALUE? Be sure to update the LAST_CORE and CORE_MASK | 107 // ADDING NEW CORE VALUE? Be sure to update the LAST_CORE and CORE_MASK |
| 104 // values below. Also update CoreTransitionString(). | 108 // values below. Also update CoreTransitionString(). |
| 105 PAGE_TRANSITION_LAST_CORE = PAGE_TRANSITION_KEYWORD_GENERATED, | 109 PAGE_TRANSITION_LAST_CORE = PAGE_TRANSITION_READING_LIST, |
| 106 PAGE_TRANSITION_CORE_MASK = 0xFF, | 110 PAGE_TRANSITION_CORE_MASK = 0xFF, |
| 107 | 111 |
| 108 // Qualifiers | 112 // Qualifiers |
| 109 // Any of the core values above can be augmented by one or more qualifiers. | 113 // Any of the core values above can be augmented by one or more qualifiers. |
| 110 // These qualifiers further define the transition. | 114 // These qualifiers further define the transition. |
| 111 | 115 |
| 112 // A managed user attempted to visit a URL but was blocked. | 116 // A managed user attempted to visit a URL but was blocked. |
| 113 PAGE_TRANSITION_BLOCKED = 0x00800000, | 117 PAGE_TRANSITION_BLOCKED = 0x00800000, |
| 114 | 118 |
| 115 // User used the Forward or Back button to navigate among browsing history. | 119 // User used the Forward or Back button to navigate among browsing history. |
| (...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 196 // PageTransitionCoreTypeIs() instead or, in rare cases, | 200 // PageTransitionCoreTypeIs() instead or, in rare cases, |
| 197 // PageTransitionTypeIncludingQualifiersIs(). | 201 // PageTransitionTypeIncludingQualifiersIs(). |
| 198 DontUseOperatorEquals operator==(PageTransition, PageTransition); | 202 DontUseOperatorEquals operator==(PageTransition, PageTransition); |
| 199 DontUseOperatorEquals operator==(PageTransition, int); | 203 DontUseOperatorEquals operator==(PageTransition, int); |
| 200 DontUseOperatorEquals operator==(int, PageTransition); | 204 DontUseOperatorEquals operator==(int, PageTransition); |
| 201 #endif // defined(CONTENT_IMPLEMENTATION) | 205 #endif // defined(CONTENT_IMPLEMENTATION) |
| 202 | 206 |
| 203 } // namespace ui | 207 } // namespace ui |
| 204 | 208 |
| 205 #endif // UI_BASE_PAGE_TRANSITION_TYPES_H_ | 209 #endif // UI_BASE_PAGE_TRANSITION_TYPES_H_ |
| OLD | NEW |