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

Unified Diff: ui/base/page_transition_types.h

Issue 562603002: Move PageTransition from //content/public/common to //ui/base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/base/BUILD.gn ('k') | ui/base/page_transition_types.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/page_transition_types.h
diff --git a/content/public/common/page_transition_types.h b/ui/base/page_transition_types.h
similarity index 66%
rename from content/public/common/page_transition_types.h
rename to ui/base/page_transition_types.h
index 1b1f8013502cf1eee3fdf754cbcceb8691829cc9..3ca67c5e326e22dd61f4b117008185a7253b31e7 100644
--- a/content/public/common/page_transition_types.h
+++ b/ui/base/page_transition_types.h
@@ -2,55 +2,55 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CONTENT_PUBLIC_COMMON_PAGE_TRANSITION_TYPES_H_
-#define CONTENT_PUBLIC_COMMON_PAGE_TRANSITION_TYPES_H_
+#ifndef UI_BASE_PAGE_TRANSITION_TYPES_H_
+#define UI_BASE_PAGE_TRANSITION_TYPES_H_
#include "base/basictypes.h"
-#include "content/common/content_export.h"
+#include "ui/base/ui_base_export.h"
-namespace content {
+namespace ui {
enum PageTransition {
#define PAGE_TRANSITION(label, value) PAGE_TRANSITION_ ## label = value,
-#include "content/public/common/page_transition_types_list.h"
+#include "ui/base/page_transition_types_list.h"
#undef PAGE_TRANSITION
};
// Compares two PageTransition types ignoring qualifiers. |rhs| is taken to
// be a compile time constant, and hence must not contain any qualifiers.
-CONTENT_EXPORT bool PageTransitionCoreTypeIs(PageTransition lhs,
+UI_BASE_EXPORT bool PageTransitionCoreTypeIs(PageTransition lhs,
PageTransition rhs);
// Simplifies the provided transition by removing any qualifier
-CONTENT_EXPORT PageTransition PageTransitionStripQualifier(
+UI_BASE_EXPORT PageTransition PageTransitionStripQualifier(
PageTransition type);
bool PageTransitionIsValidType(int32 type);
-CONTENT_EXPORT PageTransition PageTransitionFromInt(int32 type);
+UI_BASE_EXPORT PageTransition PageTransitionFromInt(int32 type);
// Returns true if the given transition is a top-level frame transition, or
// false if the transition was for a subframe.
-CONTENT_EXPORT bool PageTransitionIsMainFrame(PageTransition type);
+UI_BASE_EXPORT bool PageTransitionIsMainFrame(PageTransition type);
// Returns whether a transition involves a redirection
-CONTENT_EXPORT bool PageTransitionIsRedirect(PageTransition type);
+UI_BASE_EXPORT bool PageTransitionIsRedirect(PageTransition type);
// Returns whether a transition is a new navigation (rather than a return
// to a previously committed navigation).
-CONTENT_EXPORT bool PageTransitionIsNewNavigation(PageTransition type);
+UI_BASE_EXPORT bool PageTransitionIsNewNavigation(PageTransition type);
// Return the qualifier
-CONTENT_EXPORT int32 PageTransitionGetQualifier(PageTransition type);
+UI_BASE_EXPORT int32 PageTransitionGetQualifier(PageTransition type);
// Returns true if the transition can be triggered by the web instead of
// through UI or similar.
-CONTENT_EXPORT bool PageTransitionIsWebTriggerable(PageTransition type);
+UI_BASE_EXPORT bool PageTransitionIsWebTriggerable(PageTransition type);
// Return a string version of the core type values.
-CONTENT_EXPORT const char* PageTransitionGetCoreTransitionString(
+UI_BASE_EXPORT const char* PageTransitionGetCoreTransitionString(
PageTransition type);
// TODO(joth): Remove the #if guard here; requires all chrome layer code to
@@ -66,6 +66,6 @@ DontUseOperatorEquals operator==(PageTransition, int);
DontUseOperatorEquals operator==(int, PageTransition);
#endif // defined(CONTENT_IMPLEMENTATION)
-} // namespace content
+} // namespace ui
-#endif // CONTENT_PUBLIC_COMMON_PAGE_TRANSITION_TYPES_H_
+#endif // UI_BASE_PAGE_TRANSITION_TYPES_H_
« no previous file with comments | « ui/base/BUILD.gn ('k') | ui/base/page_transition_types.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698