content/browser/renderer_host/resource_dispatcher_host_request_info.h - Issue 8253002: Move PageTransition into content namespace. While I'm touching all these files, I've also updated...

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/renderer_host/resource_dispatcher_host_request_info.h

Issue 8253002: Move PageTransition into content namespace. While I'm touching all these files, I've also updated... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: '' Created 9 years, 2 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/renderer_host/resource_dispatcher_host.cc ('k') | content/browser/renderer_host/resource_dispatcher_host_request_info.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/resource_dispatcher_host_request_info.h

===================================================================

--- content/browser/renderer_host/resource_dispatcher_host_request_info.h (revision 105162)

+++ content/browser/renderer_host/resource_dispatcher_host_request_info.h (working copy)

@@ -12,7 +12,7 @@

#include "base/time.h"

#include "content/common/child_process_info.h"

#include "content/common/content_export.h"

-#include "content/common/page_transition_types.h"

+#include "content/public/common/page_transition_types.h"

#include "net/base/load_states.h"

#include "net/url_request/url_request.h"

#include "webkit/glue/resource_type.h"

@@ -47,7 +47,7 @@

bool is_main_frame,

int64 frame_id,

ResourceType::Type resource_type,

- PageTransition::Type transition_type,

+ content::PageTransition transition_type,

uint64 upload_size,

bool is_download,

bool allow_download,

@@ -134,7 +134,7 @@

// Identifies the type of resource, such as subframe, media, etc.

ResourceType::Type resource_type() const { return resource_type_; }

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

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

// When there is upload data, this is the byte count of that data. When there

// is no upload, this will be 0.

@@ -226,7 +226,7 @@

bool has_user_gesture_;

int pause_count_;

ResourceType::Type resource_type_;

- PageTransition::Type transition_type_;

+ content::PageTransition transition_type_;

uint64 upload_size_;

uint64 last_upload_position_;

base::TimeTicks last_upload_ticks_;