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

Side by Side Diff: chrome/browser/extensions/api/proxy/proxy_api.cc

Issue 1236493004: Final batch adding real histogram values for extension events. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: comments, rebase, dcheck, etc Created 5 years, 5 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 // Implementation of the Chrome Extensions Proxy Settings API. 5 // Implementation of the Chrome Extensions Proxy Settings API.
6 6
7 #include "chrome/browser/extensions/api/proxy/proxy_api.h" 7 #include "chrome/browser/extensions/api/proxy/proxy_api.h"
8 8
9 #include "base/json/json_writer.h" 9 #include "base/json/json_writer.h"
10 #include "base/strings/stringprintf.h" 10 #include "base/strings/stringprintf.h"
(...skipping 27 matching lines...) Expand all
38 void* profile, 38 void* profile,
39 int error_code) { 39 int error_code) {
40 scoped_ptr<base::ListValue> args(new base::ListValue()); 40 scoped_ptr<base::ListValue> args(new base::ListValue());
41 base::DictionaryValue* dict = new base::DictionaryValue(); 41 base::DictionaryValue* dict = new base::DictionaryValue();
42 dict->SetBoolean(keys::kProxyEventFatal, true); 42 dict->SetBoolean(keys::kProxyEventFatal, true);
43 dict->SetString(keys::kProxyEventError, net::ErrorToString(error_code)); 43 dict->SetString(keys::kProxyEventError, net::ErrorToString(error_code));
44 dict->SetString(keys::kProxyEventDetails, std::string()); 44 dict->SetString(keys::kProxyEventDetails, std::string());
45 args->Append(dict); 45 args->Append(dict);
46 46
47 if (profile) { 47 if (profile) {
48 event_router->DispatchEventToRenderers( 48 event_router->DispatchEventToRenderers(events::PROXY_ON_PROXY_ERROR,
49 keys::kProxyEventOnProxyError, args.Pass(), profile, true, GURL()); 49 keys::kProxyEventOnProxyError,
50 args.Pass(), profile, true, GURL());
50 } else { 51 } else {
51 event_router->BroadcastEventToRenderers( 52 event_router->BroadcastEventToRenderers(events::PROXY_ON_PROXY_ERROR,
52 keys::kProxyEventOnProxyError, args.Pass(), GURL()); 53 keys::kProxyEventOnProxyError,
54 args.Pass(), GURL());
53 } 55 }
54 } 56 }
55 57
56 void ProxyEventRouter::OnPACScriptError( 58 void ProxyEventRouter::OnPACScriptError(
57 EventRouterForwarder* event_router, 59 EventRouterForwarder* event_router,
58 void* profile, 60 void* profile,
59 int line_number, 61 int line_number,
60 const base::string16& error) { 62 const base::string16& error) {
61 scoped_ptr<base::ListValue> args(new base::ListValue()); 63 scoped_ptr<base::ListValue> args(new base::ListValue());
62 base::DictionaryValue* dict = new base::DictionaryValue(); 64 base::DictionaryValue* dict = new base::DictionaryValue();
63 dict->SetBoolean(keys::kProxyEventFatal, false); 65 dict->SetBoolean(keys::kProxyEventFatal, false);
64 dict->SetString(keys::kProxyEventError, 66 dict->SetString(keys::kProxyEventError,
65 net::ErrorToString(net::ERR_PAC_SCRIPT_FAILED)); 67 net::ErrorToString(net::ERR_PAC_SCRIPT_FAILED));
66 std::string error_msg; 68 std::string error_msg;
67 if (line_number != -1) { 69 if (line_number != -1) {
68 base::SStringPrintf(&error_msg, 70 base::SStringPrintf(&error_msg,
69 "line: %d: %s", 71 "line: %d: %s",
70 line_number, base::UTF16ToUTF8(error).c_str()); 72 line_number, base::UTF16ToUTF8(error).c_str());
71 } else { 73 } else {
72 error_msg = base::UTF16ToUTF8(error); 74 error_msg = base::UTF16ToUTF8(error);
73 } 75 }
74 dict->SetString(keys::kProxyEventDetails, error_msg); 76 dict->SetString(keys::kProxyEventDetails, error_msg);
75 args->Append(dict); 77 args->Append(dict);
76 78
77 if (profile) { 79 if (profile) {
78 event_router->DispatchEventToRenderers( 80 event_router->DispatchEventToRenderers(events::PROXY_ON_PROXY_ERROR,
79 keys::kProxyEventOnProxyError, args.Pass(), profile, true, GURL()); 81 keys::kProxyEventOnProxyError,
82 args.Pass(), profile, true, GURL());
80 } else { 83 } else {
81 event_router->BroadcastEventToRenderers( 84 event_router->BroadcastEventToRenderers(events::PROXY_ON_PROXY_ERROR,
82 keys::kProxyEventOnProxyError, args.Pass(), GURL()); 85 keys::kProxyEventOnProxyError,
86 args.Pass(), GURL());
83 } 87 }
84 } 88 }
85 89
86 ProxyPrefTransformer::ProxyPrefTransformer() { 90 ProxyPrefTransformer::ProxyPrefTransformer() {
87 } 91 }
88 92
89 ProxyPrefTransformer::~ProxyPrefTransformer() { 93 ProxyPrefTransformer::~ProxyPrefTransformer() {
90 } 94 }
91 95
92 base::Value* ProxyPrefTransformer::ExtensionToBrowserPref( 96 base::Value* ProxyPrefTransformer::ExtensionToBrowserPref(
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
177 extension_pref->Set(keys::kProxyConfigRules, proxy_rules_dict); 181 extension_pref->Set(keys::kProxyConfigRules, proxy_rules_dict);
178 break; 182 break;
179 } 183 }
180 case ProxyPrefs::kModeCount: 184 case ProxyPrefs::kModeCount:
181 NOTREACHED(); 185 NOTREACHED();
182 } 186 }
183 return extension_pref.release(); 187 return extension_pref.release();
184 } 188 }
185 189
186 } // namespace extensions 190 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698