| Index: ui/base/page_transition_types.h
|
| diff --git a/ui/base/page_transition_types.h b/ui/base/page_transition_types.h
|
| index eafea5237651e9513b2677804968c8d265a18a66..1d2d420834c2d55dca9b77bf8eb510a47c1cb240 100644
|
| --- a/ui/base/page_transition_types.h
|
| +++ b/ui/base/page_transition_types.h
|
| @@ -186,19 +186,18 @@ UI_BASE_EXPORT bool PageTransitionIsWebTriggerable(PageTransition type);
|
| UI_BASE_EXPORT const char* PageTransitionGetCoreTransitionString(
|
| PageTransition type);
|
|
|
| -// TODO(joth): Remove the #if guard here; requires all chrome layer code to
|
| -// be fixed up not to use operator==
|
| -#if defined(CONTENT_IMPLEMENTATION)
|
| // Declare a dummy class that is intentionally never defined.
|
| class DontUseOperatorEquals;
|
|
|
| -// Ban operator== as it's way too easy to forget to strip the qualifiers. Use
|
| -// PageTransitionCoreTypeIs() instead or, in rare cases,
|
| +// Ban operator== and operator!= as it's way too easy to forget to strip the
|
| +// qualifiers. Use PageTransitionCoreTypeIs() instead or, in rare cases,
|
| // PageTransitionTypeIncludingQualifiersIs().
|
| DontUseOperatorEquals operator==(PageTransition, PageTransition);
|
| DontUseOperatorEquals operator==(PageTransition, int);
|
| DontUseOperatorEquals operator==(int, PageTransition);
|
| -#endif // defined(CONTENT_IMPLEMENTATION)
|
| +DontUseOperatorEquals operator!=(PageTransition, PageTransition);
|
| +DontUseOperatorEquals operator!=(PageTransition, int);
|
| +DontUseOperatorEquals operator!=(int, PageTransition);
|
|
|
| } // namespace ui
|
|
|
|
|