Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(66)

Side by Side Diff: extensions/browser/api/web_request/web_request_api_helpers.cc

Issue 1149763005: Change NetLog::ParametersCallback to return a scoped_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: format Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 #include "extensions/browser/api/web_request/web_request_api_helpers.h" 5 #include "extensions/browser/api/web_request/web_request_api_helpers.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after
210 210
211 // Creates a NetLog callback the returns a Value with the ID of the extension 211 // Creates a NetLog callback the returns a Value with the ID of the extension
212 // that caused an event. |delta| must remain valid for the lifetime of the 212 // that caused an event. |delta| must remain valid for the lifetime of the
213 // callback. 213 // callback.
214 net::NetLog::ParametersCallback CreateNetLogExtensionIdCallback( 214 net::NetLog::ParametersCallback CreateNetLogExtensionIdCallback(
215 const EventResponseDelta* delta) { 215 const EventResponseDelta* delta) {
216 return net::NetLog::StringCallback("extension_id", &delta->extension_id); 216 return net::NetLog::StringCallback("extension_id", &delta->extension_id);
217 } 217 }
218 218
219 // Creates NetLog parameters to indicate that an extension modified a request. 219 // Creates NetLog parameters to indicate that an extension modified a request.
220 // Caller takes ownership of returned value. 220 // Caller takes ownership of returned value.
eroman 2015/05/21 03:37:42 Delete this
221 base::Value* NetLogModificationCallback(const EventResponseDelta* delta, 221 scoped_ptr<base::Value> NetLogModificationCallback(
222 net::NetLogCaptureMode capture_mode) { 222 const EventResponseDelta* delta,
223 base::DictionaryValue* dict = new base::DictionaryValue(); 223 net::NetLogCaptureMode capture_mode) {
224 scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue());
224 dict->SetString("extension_id", delta->extension_id); 225 dict->SetString("extension_id", delta->extension_id);
225 226
226 base::ListValue* modified_headers = new base::ListValue(); 227 base::ListValue* modified_headers = new base::ListValue();
227 net::HttpRequestHeaders::Iterator modification( 228 net::HttpRequestHeaders::Iterator modification(
228 delta->modified_request_headers); 229 delta->modified_request_headers);
229 while (modification.GetNext()) { 230 while (modification.GetNext()) {
230 std::string line = modification.name() + ": " + modification.value(); 231 std::string line = modification.name() + ": " + modification.value();
231 modified_headers->Append(new base::StringValue(line)); 232 modified_headers->Append(new base::StringValue(line));
232 } 233 }
233 dict->Set("modified_headers", modified_headers); 234 dict->Set("modified_headers", modified_headers);
234 235
235 base::ListValue* deleted_headers = new base::ListValue(); 236 base::ListValue* deleted_headers = new base::ListValue();
236 for (std::vector<std::string>::const_iterator key = 237 for (std::vector<std::string>::const_iterator key =
237 delta->deleted_request_headers.begin(); 238 delta->deleted_request_headers.begin();
238 key != delta->deleted_request_headers.end(); 239 key != delta->deleted_request_headers.end();
239 ++key) { 240 ++key) {
240 deleted_headers->Append(new base::StringValue(*key)); 241 deleted_headers->Append(new base::StringValue(*key));
241 } 242 }
242 dict->Set("deleted_headers", deleted_headers); 243 dict->Set("deleted_headers", deleted_headers);
243 return dict; 244 return dict.Pass();
244 } 245 }
245 246
246 bool InDecreasingExtensionInstallationTimeOrder( 247 bool InDecreasingExtensionInstallationTimeOrder(
247 const linked_ptr<EventResponseDelta>& a, 248 const linked_ptr<EventResponseDelta>& a,
248 const linked_ptr<EventResponseDelta>& b) { 249 const linked_ptr<EventResponseDelta>& b) {
249 return a->extension_install_time > b->extension_install_time; 250 return a->extension_install_time > b->extension_install_time;
250 } 251 }
251 252
252 base::ListValue* StringToCharList(const std::string& s) { 253 base::ListValue* StringToCharList(const std::string& s) {
253 base::ListValue* result = new base::ListValue; 254 base::ListValue* result = new base::ListValue;
(...skipping 1025 matching lines...) Expand 10 before | Expand all | Expand 10 after
1279 std::find(kResourceTypeStrings, 1280 std::find(kResourceTypeStrings,
1280 kResourceTypeStrings + kResourceTypeStringsLength, 1281 kResourceTypeStrings + kResourceTypeStringsLength,
1281 type_str); 1282 type_str);
1282 if (iter == (kResourceTypeStrings + kResourceTypeStringsLength)) 1283 if (iter == (kResourceTypeStrings + kResourceTypeStringsLength))
1283 return false; 1284 return false;
1284 *type = kResourceTypeValues[iter - kResourceTypeStrings]; 1285 *type = kResourceTypeValues[iter - kResourceTypeStrings];
1285 return true; 1286 return true;
1286 } 1287 }
1287 1288
1288 } // namespace extension_web_request_api_helpers 1289 } // namespace extension_web_request_api_helpers
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698