components/navigation_interception/navigation_params.h - Issue 562603002: Move PageTransition from //content/public/common to //ui/base

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: components/navigation_interception/navigation_params.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 | « components/navigation_interception/intercept_navigation_resource_throttle_unittest.cc ('k') | components/navigation_interception/navigation_params.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/navigation_interception/navigation_params.h

diff --git a/components/navigation_interception/navigation_params.h b/components/navigation_interception/navigation_params.h

index 0144a5af02396cdba0c59acc4e24ec67fb546c91..104de0972016eaff1bbdcbe264b7d6b2951fe942 100644

--- a/components/navigation_interception/navigation_params.h

+++ b/components/navigation_interception/navigation_params.h

@@ -5,9 +5,9 @@

#ifndef COMPONENTS_NAVIGATION_INTERCEPTION_NAVIGATION_PARAMS_H_

#define COMPONENTS_NAVIGATION_INTERCEPTION_NAVIGATION_PARAMS_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 navigation_interception {

@@ -18,7 +18,7 @@ class NavigationParams {

const content::Referrer& referrer,

bool has_user_gesture,

bool is_post,

- content::PageTransition page_transition_type,

+ ui::PageTransition page_transition_type,

bool is_redirect);

NavigationParams(const NavigationParams& other);

void operator=(const NavigationParams& rhs);

@@ -28,7 +28,7 @@ class NavigationParams {

const content::Referrer& referrer() const { return referrer_; }

bool has_user_gesture() const { return has_user_gesture_; }

bool is_post() const { return is_post_; }

- content::PageTransition transition_type() const { return transition_type_; }

+ ui::PageTransition transition_type() const { return transition_type_; }

bool is_redirect() const { return is_redirect_; }

private:

@@ -38,7 +38,7 @@ class NavigationParams {

content::Referrer referrer_;

bool has_user_gesture_;

bool is_post_;

- content::PageTransition transition_type_;

+ ui::PageTransition transition_type_;

bool is_redirect_;

};