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

Unified Diff: chrome/browser/ui/browser_navigator.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 | « chrome/browser/ui/browser_focus_uitest.cc ('k') | chrome/browser/ui/browser_navigator.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/browser_navigator.h
diff --git a/chrome/browser/ui/browser_navigator.h b/chrome/browser/ui/browser_navigator.h
index 5cb200f9274f7c55b09b7baa6f5c5c4514129354..4209927811452747814160386e8e2e8d14e6af60 100644
--- a/chrome/browser/ui/browser_navigator.h
+++ b/chrome/browser/ui/browser_navigator.h
@@ -13,8 +13,8 @@
#include "content/public/browser/browser_context.h"
#include "content/public/browser/global_request_id.h"
#include "content/public/browser/page_navigator.h"
-#include "content/public/common/page_transition_types.h"
#include "content/public/common/referrer.h"
+#include "ui/base/page_transition_types.h"
#include "ui/base/window_open_disposition.h"
#include "ui/gfx/rect.h"
#include "url/gurl.h"
@@ -34,12 +34,12 @@ namespace chrome {
//
// Simple Navigate to URL in current tab:
// chrome::NavigateParams params(browser, GURL("http://www.google.com/"),
-// content::PAGE_TRANSITION_LINK);
+// ui::PAGE_TRANSITION_LINK);
// chrome::Navigate(&params);
//
// Open bookmark in new background tab:
// chrome::NavigateParams params(browser, url,
-// content::PAGE_TRANSITION_AUTO_BOOKMARK);
+// ui::PAGE_TRANSITION_AUTO_BOOKMARK);
// params.disposition = NEW_BACKGROUND_TAB;
// chrome::Navigate(&params);
//
@@ -53,12 +53,12 @@ namespace chrome {
struct NavigateParams {
NavigateParams(Browser* browser,
const GURL& a_url,
- content::PageTransition a_transition);
+ ui::PageTransition a_transition);
NavigateParams(Browser* browser,
content::WebContents* a_target_contents);
NavigateParams(Profile* profile,
const GURL& a_url,
- content::PageTransition a_transition);
+ ui::PageTransition a_transition);
~NavigateParams();
// The URL/referrer to be loaded. Ignored if |target_contents| is non-NULL.
@@ -129,9 +129,9 @@ struct NavigateParams {
bool trusted_source;
// The transition type of the navigation. Default is
- // content::PAGE_TRANSITION_LINK when target_contents is specified in the
+ // ui::PAGE_TRANSITION_LINK when target_contents is specified in the
// constructor.
- content::PageTransition transition;
+ ui::PageTransition transition;
// Whether this navigation was initiated by the renderer process. Default is
// false.
« no previous file with comments | « chrome/browser/ui/browser_focus_uitest.cc ('k') | chrome/browser/ui/browser_navigator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698