content/browser/frame_host/navigation_entry_impl.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: content/browser/frame_host/navigation_entry_impl.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/browser/frame_host/navigation_controller_impl_unittest.cc ('k') | content/browser/frame_host/navigation_entry_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/frame_host/navigation_entry_impl.h

diff --git a/content/browser/frame_host/navigation_entry_impl.h b/content/browser/frame_host/navigation_entry_impl.h

index 613f45edb42b039a7f1d1a2a6830610a60c8e4f6..e1f243f89c77517dac061dd7e74c5b2aeead6899 100644

--- a/content/browser/frame_host/navigation_entry_impl.h

+++ b/content/browser/frame_host/navigation_entry_impl.h

@@ -30,7 +30,7 @@ class CONTENT_EXPORT NavigationEntryImpl

const GURL& url,

const Referrer& referrer,

const base::string16& title,

- PageTransition transition_type,

+ ui::PageTransition transition_type,

bool is_renderer_initiated);

virtual ~NavigationEntryImpl();

@@ -54,8 +54,8 @@ class CONTENT_EXPORT NavigationEntryImpl

virtual const base::string16& GetTitleForDisplay(

const std::string& languages) const OVERRIDE;

virtual bool IsViewSourceMode() const OVERRIDE;

- virtual void SetTransitionType(PageTransition transition_type) OVERRIDE;

- virtual PageTransition GetTransitionType() const OVERRIDE;

+ virtual void SetTransitionType(ui::PageTransition transition_type) OVERRIDE;

+ virtual ui::PageTransition GetTransitionType() const OVERRIDE;

virtual const GURL& GetUserTypedURL() const OVERRIDE;

virtual void SetHasPostData(bool has_post_data) OVERRIDE;

virtual bool GetHasPostData() const OVERRIDE;

@@ -241,7 +241,7 @@ class CONTENT_EXPORT NavigationEntryImpl

PageState page_state_;

int32 page_id_;

SSLStatus ssl_;

- PageTransition transition_type_;

+ ui::PageTransition transition_type_;

GURL user_typed_url_;

bool has_post_data_;

int64 post_id_;