OLD | NEW |
---|---|
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 // The intent of this file is to provide a type-neutral abstraction between | 5 // The intent of this file is to provide a type-neutral abstraction between |
6 // Chrome and WebKit for resource loading. This pure-virtual interface is | 6 // Chrome and WebKit for resource loading. This pure-virtual interface is |
7 // implemented by the embedder, which also provides a factory method Create | 7 // implemented by the embedder, which also provides a factory method Create |
8 // to instantiate this object. | 8 // to instantiate this object. |
9 // | 9 // |
10 // One of these objects will be created by WebKit for each request. WebKit | 10 // One of these objects will be created by WebKit for each request. WebKit |
(...skipping 12 matching lines...) Expand all Loading... | |
23 #include "build/build_config.h" | 23 #include "build/build_config.h" |
24 #if defined(OS_POSIX) | 24 #if defined(OS_POSIX) |
25 #include "base/file_descriptor_posix.h" | 25 #include "base/file_descriptor_posix.h" |
26 #endif | 26 #endif |
27 #include "base/file_path.h" | 27 #include "base/file_path.h" |
28 #include "base/memory/ref_counted.h" | 28 #include "base/memory/ref_counted.h" |
29 #include "base/memory/scoped_ptr.h" | 29 #include "base/memory/scoped_ptr.h" |
30 #include "base/platform_file.h" | 30 #include "base/platform_file.h" |
31 #include "base/time.h" | 31 #include "base/time.h" |
32 #include "base/values.h" | 32 #include "base/values.h" |
33 #include "content/common/page_transition_types.h" | |
darin (slow to review)
2011/08/18 04:21:01
i see...
hmm, it certainly seems a bit wrong for
Peter Kasting
2011/08/18 19:47:36
I'm happy to do the gruntwork of whatever the righ
| |
33 #include "googleurl/src/gurl.h" | 34 #include "googleurl/src/gurl.h" |
34 #include "net/base/host_port_pair.h" | 35 #include "net/base/host_port_pair.h" |
35 #include "net/url_request/url_request_status.h" | 36 #include "net/url_request/url_request_status.h" |
36 #include "webkit/glue/resource_type.h" | 37 #include "webkit/glue/resource_type.h" |
37 | 38 |
38 namespace net { | 39 namespace net { |
39 class HttpResponseHeaders; | 40 class HttpResponseHeaders; |
40 } | 41 } |
41 | 42 |
42 namespace webkit_glue { | 43 namespace webkit_glue { |
(...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
246 | 247 |
247 // True if the request was user initiated. | 248 // True if the request was user initiated. |
248 bool has_user_gesture; | 249 bool has_user_gesture; |
249 | 250 |
250 // True if |frame_id| represents a main frame of a RenderView. | 251 // True if |frame_id| represents a main frame of a RenderView. |
251 bool is_main_frame; | 252 bool is_main_frame; |
252 | 253 |
253 // Identifies the frame within the RenderView that sent the request. | 254 // Identifies the frame within the RenderView that sent the request. |
254 // -1 if unknown / invalid. | 255 // -1 if unknown / invalid. |
255 int64 frame_id; | 256 int64 frame_id; |
257 | |
258 PageTransition::Type transition_type; | |
256 }; | 259 }; |
257 | 260 |
258 // See the SyncLoad method declared below. (The name of this struct is not | 261 // See the SyncLoad method declared below. (The name of this struct is not |
259 // suffixed with "Info" because it also contains the response data.) | 262 // suffixed with "Info" because it also contains the response data.) |
260 struct SyncLoadResponse : ResourceResponseInfo { | 263 struct SyncLoadResponse : ResourceResponseInfo { |
261 SyncLoadResponse(); | 264 SyncLoadResponse(); |
262 ~SyncLoadResponse(); | 265 ~SyncLoadResponse(); |
263 | 266 |
264 // The response status. | 267 // The response status. |
265 net::URLRequestStatus status; | 268 net::URLRequestStatus status; |
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
393 // construction must go through Create() | 396 // construction must go through Create() |
394 ResourceLoaderBridge(); | 397 ResourceLoaderBridge(); |
395 | 398 |
396 private: | 399 private: |
397 DISALLOW_COPY_AND_ASSIGN(ResourceLoaderBridge); | 400 DISALLOW_COPY_AND_ASSIGN(ResourceLoaderBridge); |
398 }; | 401 }; |
399 | 402 |
400 } // namespace webkit_glue | 403 } // namespace webkit_glue |
401 | 404 |
402 #endif // WEBKIT_GLUE_RESOURCE_LOADER_BRIDGE_H_ | 405 #endif // WEBKIT_GLUE_RESOURCE_LOADER_BRIDGE_H_ |
OLD | NEW |