diff options
| author | idanan@chromium.org <idanan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-24 17:00:15 +0000 |
|---|---|---|
| committer | idanan@chromium.org <idanan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-24 17:00:15 +0000 |
| commit | 9fa75843d1f81abc9c8bf445be16d6f28fbd3577 (patch) | |
| tree | 644d8dcc391799c4855a7bf89de9e56df2460b95 /net/url_request/url_request.cc | |
| parent | 5e56a3a8e84ee5b4417077f5f3ec17b7dbe73bd1 (diff) | |
| download | chromium_src-9fa75843d1f81abc9c8bf445be16d6f28fbd3577.zip chromium_src-9fa75843d1f81abc9c8bf445be16d6f28fbd3577.tar.gz chromium_src-9fa75843d1f81abc9c8bf445be16d6f28fbd3577.tar.bz2 | |
Return Error Status Upon Blocking Requests
Blocked requests now return an error status so that the Chrome throbber does
not spin indefinitely when blocking URL requests.
This code shall be replaced with resource substitution next but gives a better
experience until then. Same goes for the added type-based interception.
TEST=none
BUG=16932
Review URL: http://codereview.chromium.org/159214
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21536 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/url_request/url_request.cc')
| -rw-r--r-- | net/url_request/url_request.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc index 18437ad..0f8ec34 100644 --- a/net/url_request/url_request.cc +++ b/net/url_request/url_request.cc @@ -475,14 +475,14 @@ int64 URLRequest::GetExpectedContentSize() const { return expected_content_size; } -URLRequest::UserData* URLRequest::GetUserData(void* key) const { +URLRequest::UserData* URLRequest::GetUserData(const void* key) const { UserDataMap::const_iterator found = user_data_.find(key); if (found != user_data_.end()) return found->second.get(); return NULL; } -void URLRequest::SetUserData(void* key, UserData* data) { +void URLRequest::SetUserData(const void* key, UserData* data) { user_data_[key] = linked_ptr<UserData>(data); } |