diff options
| author | battre@chromium.org <battre@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-19 09:28:47 +0000 |
|---|---|---|
| committer | battre@chromium.org <battre@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-19 09:28:47 +0000 |
| commit | 2a64622057640041e14b6fb594517fd7b15ea868 (patch) | |
| tree | 080f6d3c32eef3cd2dbfc409ab71d0a8bb09402c /chrome/browser | |
| parent | 89893c82d9cc50e616ac2a7cedb4f6cf7744c880 (diff) | |
| download | chromium_src-2a64622057640041e14b6fb594517fd7b15ea868.zip chromium_src-2a64622057640041e14b6fb594517fd7b15ea868.tar.gz chromium_src-2a64622057640041e14b6fb594517fd7b15ea868.tar.bz2 | |
Added 'wasCached' parameter to webRequest API
Added a parameter that indicates whether a request was answered from the cache on disk.
BUG=81262
TEST=no
Review URL: http://codereview.chromium.org/7390006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92990 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
3 files changed, 6 insertions, 0 deletions
diff --git a/chrome/browser/extensions/extension_webrequest_api.cc b/chrome/browser/extensions/extension_webrequest_api.cc index a021fe3..b148573 100644 --- a/chrome/browser/extensions/extension_webrequest_api.cc +++ b/chrome/browser/extensions/extension_webrequest_api.cc @@ -507,6 +507,7 @@ void ExtensionWebRequestEventRouter::OnBeforeRedirect( dict->SetInteger(keys::kStatusCodeKey, http_status_code); if (!response_ip.empty()) dict->SetString(keys::kIpKey, response_ip); + dict->SetBoolean(keys::kFromCache, request->was_cached()); dict->SetDouble(keys::kTimeStampKey, time.ToDoubleT() * 1000); if (extra_info_spec & ExtraInfoSpec::RESPONSE_HEADERS) { dict->Set(keys::kResponseHeadersKey, @@ -556,6 +557,7 @@ void ExtensionWebRequestEventRouter::OnResponseStarted( dict->SetString(keys::kUrlKey, request->url().spec()); if (!response_ip.empty()) dict->SetString(keys::kIpKey, response_ip); + dict->SetBoolean(keys::kFromCache, request->was_cached()); dict->SetInteger(keys::kStatusCodeKey, response_code); dict->SetDouble(keys::kTimeStampKey, time.ToDoubleT() * 1000); if (extra_info_spec & ExtraInfoSpec::RESPONSE_HEADERS) { @@ -607,6 +609,7 @@ void ExtensionWebRequestEventRouter::OnCompleted( dict->SetInteger(keys::kStatusCodeKey, response_code); if (!response_ip.empty()) dict->SetString(keys::kIpKey, response_ip); + dict->SetBoolean(keys::kFromCache, request->was_cached()); dict->SetDouble(keys::kTimeStampKey, time.ToDoubleT() * 1000); if (extra_info_spec & ExtraInfoSpec::RESPONSE_HEADERS) { dict->Set(keys::kResponseHeadersKey, @@ -652,6 +655,7 @@ void ExtensionWebRequestEventRouter::OnErrorOccurred( dict->SetString(keys::kUrlKey, request->url().spec()); if (!response_ip.empty()) dict->SetString(keys::kIpKey, response_ip); + dict->SetBoolean(keys::kFromCache, request->was_cached()); dict->SetString(keys::kErrorKey, net::ErrorToString(request->status().os_error())); dict->SetDouble(keys::kTimeStampKey, time.ToDoubleT() * 1000); diff --git a/chrome/browser/extensions/extension_webrequest_api_constants.cc b/chrome/browser/extensions/extension_webrequest_api_constants.cc index e627e18..2f49d37 100644 --- a/chrome/browser/extensions/extension_webrequest_api_constants.cc +++ b/chrome/browser/extensions/extension_webrequest_api_constants.cc @@ -7,6 +7,7 @@ namespace extension_webrequest_api_constants { const char kErrorKey[] = "error"; +const char kFromCache[] = "fromCache"; const char kIpKey[] = "ip"; const char kMethodKey[] = "method"; const char kRedirectUrlKey[] = "redirectUrl"; diff --git a/chrome/browser/extensions/extension_webrequest_api_constants.h b/chrome/browser/extensions/extension_webrequest_api_constants.h index bc3f5ba..6715cd7 100644 --- a/chrome/browser/extensions/extension_webrequest_api_constants.h +++ b/chrome/browser/extensions/extension_webrequest_api_constants.h @@ -12,6 +12,7 @@ namespace extension_webrequest_api_constants { // Keys. extern const char kErrorKey[]; +extern const char kFromCache[]; extern const char kIpKey[]; extern const char kMethodKey[]; extern const char kRedirectUrlKey[]; |