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

Side by Side Diff: chrome/browser/extensions/extension_webrequest_api.cc

Issue 7846007: net: Rename URLRequestStatus::os_error_. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix os_error_code Created 9 years, 3 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 | Annotate | Revision Log
OLDNEW
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 #include "chrome/browser/extensions/extension_webrequest_api.h" 5 #include "chrome/browser/extensions/extension_webrequest_api.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/json/json_writer.h" 9 #include "base/json/json_writer.h"
10 #include "base/metrics/histogram.h" 10 #include "base/metrics/histogram.h"
(...skipping 10 matching lines...) Expand all
21 #include "chrome/browser/profiles/profile.h" 21 #include "chrome/browser/profiles/profile.h"
22 #include "chrome/browser/renderer_host/chrome_render_message_filter.h" 22 #include "chrome/browser/renderer_host/chrome_render_message_filter.h"
23 #include "chrome/common/extensions/extension.h" 23 #include "chrome/common/extensions/extension.h"
24 #include "chrome/common/extensions/extension_error_utils.h" 24 #include "chrome/common/extensions/extension_error_utils.h"
25 #include "chrome/common/extensions/url_pattern.h" 25 #include "chrome/common/extensions/url_pattern.h"
26 #include "chrome/common/url_constants.h" 26 #include "chrome/common/url_constants.h"
27 #include "content/browser/browser_message_filter.h" 27 #include "content/browser/browser_message_filter.h"
28 #include "content/browser/browser_thread.h" 28 #include "content/browser/browser_thread.h"
29 #include "content/browser/renderer_host/resource_dispatcher_host.h" 29 #include "content/browser/renderer_host/resource_dispatcher_host.h"
30 #include "content/browser/renderer_host/resource_dispatcher_host_request_info.h" 30 #include "content/browser/renderer_host/resource_dispatcher_host_request_info.h"
31 #include "googleurl/src/gurl.h"
32 #include "grit/generated_resources.h"
31 #include "net/base/auth.h" 33 #include "net/base/auth.h"
32 #include "net/base/net_errors.h" 34 #include "net/base/net_errors.h"
33 #include "net/base/net_log.h" 35 #include "net/base/net_log.h"
34 #include "net/http/http_response_headers.h" 36 #include "net/http/http_response_headers.h"
35 #include "net/url_request/url_request.h" 37 #include "net/url_request/url_request.h"
36 #include "googleurl/src/gurl.h"
37 #include "grit/generated_resources.h"
38 #include "ui/base/l10n/l10n_util.h" 38 #include "ui/base/l10n/l10n_util.h"
39 39
40 namespace keys = extension_webrequest_api_constants; 40 namespace keys = extension_webrequest_api_constants;
41 41
42 namespace { 42 namespace {
43 43
44 // List of all the webRequest events. 44 // List of all the webRequest events.
45 static const char* const kWebRequestEvents[] = { 45 static const char* const kWebRequestEvents[] = {
46 keys::kOnBeforeRedirect, 46 keys::kOnBeforeRedirect,
47 keys::kOnBeforeRequest, 47 keys::kOnBeforeRequest,
(...skipping 767 matching lines...) Expand 10 before | Expand all | Expand 10 after
815 815
816 ListValue args; 816 ListValue args;
817 DictionaryValue* dict = new DictionaryValue(); 817 DictionaryValue* dict = new DictionaryValue();
818 dict->SetString(keys::kRequestIdKey, 818 dict->SetString(keys::kRequestIdKey,
819 base::Uint64ToString(request->identifier())); 819 base::Uint64ToString(request->identifier()));
820 dict->SetString(keys::kUrlKey, request->url().spec()); 820 dict->SetString(keys::kUrlKey, request->url().spec());
821 if (!response_ip.empty()) 821 if (!response_ip.empty())
822 dict->SetString(keys::kIpKey, response_ip); 822 dict->SetString(keys::kIpKey, response_ip);
823 dict->SetBoolean(keys::kFromCache, request->was_cached()); 823 dict->SetBoolean(keys::kFromCache, request->was_cached());
824 dict->SetString(keys::kErrorKey, 824 dict->SetString(keys::kErrorKey,
825 net::ErrorToString(request->status().os_error())); 825 net::ErrorToString(request->status().error()));
826 dict->SetDouble(keys::kTimeStampKey, time.ToDoubleT() * 1000); 826 dict->SetDouble(keys::kTimeStampKey, time.ToDoubleT() * 1000);
827 args.Append(dict); 827 args.Append(dict);
828 828
829 DispatchEvent(profile, request, listeners, args); 829 DispatchEvent(profile, request, listeners, args);
830 } 830 }
831 831
832 void ExtensionWebRequestEventRouter::OnURLRequestDestroyed( 832 void ExtensionWebRequestEventRouter::OnURLRequestDestroyed(
833 void* profile, net::URLRequest* request) { 833 void* profile, net::URLRequest* request) {
834 blocked_requests_.erase(request->identifier()); 834 blocked_requests_.erase(request->identifier());
835 signaled_requests_.erase(request->identifier()); 835 signaled_requests_.erase(request->identifier());
(...skipping 650 matching lines...) Expand 10 before | Expand all | Expand 10 after
1486 } 1486 }
1487 } 1487 }
1488 } 1488 }
1489 1489
1490 ExtensionWebRequestEventRouter::GetInstance()->OnEventHandled( 1490 ExtensionWebRequestEventRouter::GetInstance()->OnEventHandled(
1491 profile(), extension_id(), event_name, sub_event_name, request_id, 1491 profile(), extension_id(), event_name, sub_event_name, request_id,
1492 response.release()); 1492 response.release());
1493 1493
1494 return true; 1494 return true;
1495 } 1495 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698