diff options
| author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-20 00:50:05 +0000 |
|---|---|---|
| committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-20 00:50:05 +0000 |
| commit | 940895b5308ace929396a87bd13cf0764f0c16e2 (patch) | |
| tree | b30776c7715555ce2da576e03fb6aa466c997c9d /content/common/resource_dispatcher.cc | |
| parent | 74f649e83fb1b6f144ff20bde6abd7ca752689f9 (diff) | |
| download | chromium_src-940895b5308ace929396a87bd13cf0764f0c16e2.zip chromium_src-940895b5308ace929396a87bd13cf0764f0c16e2.tar.gz chromium_src-940895b5308ace929396a87bd13cf0764f0c16e2.tar.bz2 | |
Move the RequestExtraData structure to content/, where we can modify it more freely.
BUG=87192
TEST=none
Review URL: http://codereview.chromium.org/7697009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97539 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/common/resource_dispatcher.cc')
| -rw-r--r-- | content/common/resource_dispatcher.cc | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/content/common/resource_dispatcher.cc b/content/common/resource_dispatcher.cc index 2ee2db7..301c3bf 100644 --- a/content/common/resource_dispatcher.cc +++ b/content/common/resource_dispatcher.cc @@ -12,6 +12,7 @@ #include "base/message_loop.h" #include "base/shared_memory.h" #include "base/string_util.h" +#include "content/common/request_extra_data.h" #include "content/common/resource_dispatcher_delegate.h" #include "content/common/resource_messages.h" #include "content/common/resource_response.h" @@ -93,8 +94,15 @@ IPCResourceLoaderBridge::IPCResourceLoaderBridge( request_.appcache_host_id = request_info.appcache_host_id; request_.download_to_file = request_info.download_to_file; request_.has_user_gesture = request_info.has_user_gesture; - request_.is_main_frame = request_info.is_main_frame; - request_.frame_id = request_info.frame_id; + if (request_info.extra_data) { + RequestExtraData* extra_data = + static_cast<RequestExtraData*>(request_info.extra_data); + request_.is_main_frame = extra_data->is_main_frame(); + request_.frame_id = extra_data->frame_identifier(); + } else { + request_.is_main_frame = false; + request_.frame_id = -1; + } } IPCResourceLoaderBridge::~IPCResourceLoaderBridge() { |