| Index: content/child/request_extra_data.h
|
| diff --git a/content/child/request_extra_data.h b/content/child/request_extra_data.h
|
| index bae5512c173c75922789db3a697c2921028e0355..0db769996fb5aebf6d81c8fa7422070b28ca805f 100644
|
| --- a/content/child/request_extra_data.h
|
| +++ b/content/child/request_extra_data.h
|
| @@ -7,10 +7,10 @@
|
|
|
| #include "base/compiler_specific.h"
|
| #include "content/common/content_export.h"
|
| -#include "content/public/common/page_transition_types.h"
|
| #include "third_party/WebKit/public/platform/WebString.h"
|
| #include "third_party/WebKit/public/platform/WebURLRequest.h"
|
| #include "third_party/WebKit/public/web/WebPageVisibilityState.h"
|
| +#include "ui/base/page_transition_types.h"
|
|
|
| namespace content {
|
|
|
| @@ -53,8 +53,8 @@ class CONTENT_EXPORT RequestExtraData
|
| void set_allow_download(bool allow_download) {
|
| allow_download_ = allow_download;
|
| }
|
| - PageTransition transition_type() const { return transition_type_; }
|
| - void set_transition_type(PageTransition transition_type) {
|
| + ui::PageTransition transition_type() const { return transition_type_; }
|
| + void set_transition_type(ui::PageTransition transition_type) {
|
| transition_type_ = transition_type;
|
| }
|
| bool should_replace_current_entry() const {
|
| @@ -110,7 +110,7 @@ class CONTENT_EXPORT RequestExtraData
|
| bool parent_is_main_frame_;
|
| int parent_render_frame_id_;
|
| bool allow_download_;
|
| - PageTransition transition_type_;
|
| + ui::PageTransition transition_type_;
|
| bool should_replace_current_entry_;
|
| int transferred_request_child_id_;
|
| int transferred_request_request_id_;
|
|
|