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

Unified Diff: content/public/browser/navigation_controller.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 | « content/public/browser/load_notification_details.h ('k') | content/public/browser/navigation_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/public/browser/navigation_controller.h
diff --git a/content/public/browser/navigation_controller.h b/content/public/browser/navigation_controller.h
index 08ea0b9985df75e9388b91963f6ac7accea1ff82..1daf03c2faf9feedd4824e9ffa75386878982d00 100644
--- a/content/public/browser/navigation_controller.h
+++ b/content/public/browser/navigation_controller.h
@@ -14,8 +14,8 @@
#include "content/common/content_export.h"
#include "content/public/browser/global_request_id.h"
#include "content/public/browser/session_storage_namespace.h"
-#include "content/public/common/page_transition_types.h"
#include "content/public/common/referrer.h"
+#include "ui/base/page_transition_types.h"
#include "url/gurl.h"
namespace base {
@@ -94,7 +94,7 @@ class NavigationController {
CONTENT_EXPORT static NavigationEntry* CreateNavigationEntry(
const GURL& url,
const Referrer& referrer,
- PageTransition transition,
+ ui::PageTransition transition,
bool is_renderer_initiated,
const std::string& extra_headers,
BrowserContext* browser_context);
@@ -109,7 +109,7 @@ class NavigationController {
// PageTransition for this load. See PageTransition for details.
// Note the default value in constructor below.
- PageTransition transition_type;
+ ui::PageTransition transition_type;
// The FrameTreeNode ID for the frame to navigate, or -1 for the main frame.
int64 frame_tree_node_id;
@@ -296,7 +296,7 @@ class NavigationController {
// request. Extra headers are separated by \n.
virtual void LoadURL(const GURL& url,
const Referrer& referrer,
- PageTransition type,
+ ui::PageTransition type,
const std::string& extra_headers) = 0;
// More general version of LoadURL. See comments in LoadURLParams for
« no previous file with comments | « content/public/browser/load_notification_details.h ('k') | content/public/browser/navigation_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698