OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #ifndef CONTENT_CHILD_REQUEST_EXTRA_DATA_H_ | 5 #ifndef CONTENT_CHILD_REQUEST_EXTRA_DATA_H_ |
6 #define CONTENT_CHILD_REQUEST_EXTRA_DATA_H_ | 6 #define CONTENT_CHILD_REQUEST_EXTRA_DATA_H_ |
7 | 7 |
8 #include "base/compiler_specific.h" | 8 #include "base/compiler_specific.h" |
9 #include "content/common/content_export.h" | 9 #include "content/common/content_export.h" |
10 #include "content/public/common/page_transition_types.h" | 10 #include "content/public/common/page_transition_types.h" |
11 #include "third_party/WebKit/public/web/WebSecurityOrigin.h" | |
darin (slow to review)
2013/08/20 23:47:05
nit: looks like WebSecurityOrigin.h is not needed.
dsjang
2013/08/21 18:49:57
Done.
| |
11 #include "webkit/child/weburlrequest_extradata_impl.h" | 12 #include "webkit/child/weburlrequest_extradata_impl.h" |
12 | 13 |
13 namespace content { | 14 namespace content { |
14 | 15 |
15 // The RenderView stores an instance of this class in the "extra data" of each | 16 // The RenderView stores an instance of this class in the "extra data" of each |
16 // ResourceRequest (see RenderView::willSendRequest). | 17 // ResourceRequest (see RenderView::willSendRequest). |
17 class CONTENT_EXPORT RequestExtraData | 18 class CONTENT_EXPORT RequestExtraData |
18 : NON_EXPORTED_BASE(public webkit_glue::WebURLRequestExtraDataImpl) { | 19 : NON_EXPORTED_BASE(public webkit_glue::WebURLRequestExtraDataImpl) { |
19 public: | 20 public: |
20 RequestExtraData(WebKit::WebReferrerPolicy referrer_policy, | 21 RequestExtraData(WebKit::WebReferrerPolicy referrer_policy, |
21 const WebKit::WebString& custom_user_agent, | 22 const WebKit::WebString& custom_user_agent, |
22 bool was_after_preconnect_request, | 23 bool was_after_preconnect_request, |
23 bool is_main_frame, | 24 bool is_main_frame, |
24 int64 frame_id, | 25 int64 frame_id, |
26 const GURL& frame_origin, | |
25 bool parent_is_main_frame, | 27 bool parent_is_main_frame, |
26 int64 parent_frame_id, | 28 int64 parent_frame_id, |
27 bool allow_download, | 29 bool allow_download, |
28 PageTransition transition_type, | 30 PageTransition transition_type, |
29 int transferred_request_child_id, | 31 int transferred_request_child_id, |
30 int transferred_request_request_id); | 32 int transferred_request_request_id); |
31 virtual ~RequestExtraData(); | 33 virtual ~RequestExtraData(); |
32 | 34 |
33 bool is_main_frame() const { return is_main_frame_; } | 35 bool is_main_frame() const { return is_main_frame_; } |
34 int64 frame_id() const { return frame_id_; } | 36 int64 frame_id() const { return frame_id_; } |
37 GURL frame_origin() const { return frame_origin_; } | |
35 bool parent_is_main_frame() const { return parent_is_main_frame_; } | 38 bool parent_is_main_frame() const { return parent_is_main_frame_; } |
36 int64 parent_frame_id() const { return parent_frame_id_; } | 39 int64 parent_frame_id() const { return parent_frame_id_; } |
37 bool allow_download() const { return allow_download_; } | 40 bool allow_download() const { return allow_download_; } |
38 PageTransition transition_type() const { return transition_type_; } | 41 PageTransition transition_type() const { return transition_type_; } |
39 int transferred_request_child_id() const { | 42 int transferred_request_child_id() const { |
40 return transferred_request_child_id_; | 43 return transferred_request_child_id_; |
41 } | 44 } |
42 int transferred_request_request_id() const { | 45 int transferred_request_request_id() const { |
43 return transferred_request_request_id_; | 46 return transferred_request_request_id_; |
44 } | 47 } |
45 | 48 |
46 private: | 49 private: |
47 bool is_main_frame_; | 50 bool is_main_frame_; |
48 int64 frame_id_; | 51 int64 frame_id_; |
52 GURL frame_origin_; | |
49 bool parent_is_main_frame_; | 53 bool parent_is_main_frame_; |
50 int64 parent_frame_id_; | 54 int64 parent_frame_id_; |
51 bool allow_download_; | 55 bool allow_download_; |
52 PageTransition transition_type_; | 56 PageTransition transition_type_; |
53 int transferred_request_child_id_; | 57 int transferred_request_child_id_; |
54 int transferred_request_request_id_; | 58 int transferred_request_request_id_; |
55 | 59 |
56 DISALLOW_COPY_AND_ASSIGN(RequestExtraData); | 60 DISALLOW_COPY_AND_ASSIGN(RequestExtraData); |
57 }; | 61 }; |
58 | 62 |
59 } // namespace content | 63 } // namespace content |
60 | 64 |
61 #endif // CONTENT_CHILD_REQUEST_EXTRA_DATA_H_ | 65 #endif // CONTENT_CHILD_REQUEST_EXTRA_DATA_H_ |
OLD | NEW |