content/browser/loader/resource_request_info_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/loader/resource_request_info_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/loader/resource_dispatcher_host_unittest.cc ('k') | content/browser/loader/resource_request_info_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/loader/resource_request_info_impl.h

diff --git a/content/browser/loader/resource_request_info_impl.h b/content/browser/loader/resource_request_info_impl.h

index 54dd85dbaa814e9d6ea3531eb8ff49c2d63d5149..23279c84a0b6a8ac846cd609f4cd8168af5574d4 100644

--- a/content/browser/loader/resource_request_info_impl.h

+++ b/content/browser/loader/resource_request_info_impl.h

@@ -50,7 +50,7 @@ class ResourceRequestInfoImpl : public ResourceRequestInfo,

bool parent_is_main_frame,

int parent_render_frame_id,

ResourceType resource_type,

- PageTransition transition_type,

+ ui::PageTransition transition_type,

bool should_replace_current_entry,

bool is_download,

bool is_stream,

@@ -78,7 +78,7 @@ class ResourceRequestInfoImpl : public ResourceRequestInfo,

virtual int GetProcessType() const OVERRIDE;

virtual blink::WebReferrerPolicy GetReferrerPolicy() const OVERRIDE;

virtual blink::WebPageVisibilityState GetVisibilityState() const OVERRIDE;

- virtual PageTransition GetPageTransition() const OVERRIDE;

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

virtual bool HasUserGesture() const OVERRIDE;

virtual bool WasIgnoredByHandler() const OVERRIDE;

virtual bool GetAssociatedRenderFrame(int* render_process_id,

@@ -181,7 +181,7 @@ class ResourceRequestInfoImpl : public ResourceRequestInfo,

bool enable_load_timing_;

bool was_ignored_by_handler_;

ResourceType resource_type_;

- PageTransition transition_type_;

+ ui::PageTransition transition_type_;

int memory_cost_;

blink::WebReferrerPolicy referrer_policy_;

blink::WebPageVisibilityState visibility_state_;