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

Unified Diff: chrome/browser/extensions/api/proxy/proxy_api.cc

Issue 10694085: Refactor extension event distribution to use Values instead of JSON strings. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase and review changes. Created 8 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/api/proxy/proxy_api.cc
diff --git a/chrome/browser/extensions/api/proxy/proxy_api.cc b/chrome/browser/extensions/api/proxy/proxy_api.cc
index d058bc235964b3530c536fb862b14cfa7c7422c0..9e46c2d18890b546b58ba78bfbd4982017aac830 100644
--- a/chrome/browser/extensions/api/proxy/proxy_api.cc
+++ b/chrome/browser/extensions/api/proxy/proxy_api.cc
@@ -37,22 +37,19 @@ void ProxyEventRouter::OnProxyError(
ExtensionEventRouterForwarder* event_router,
void* profile,
int error_code) {
- ListValue args;
+ ListValue* args = new ListValue();
DictionaryValue* dict = new DictionaryValue();
dict->SetBoolean(keys::kProxyEventFatal, true);
dict->SetString(keys::kProxyEventError, net::ErrorToString(error_code));
dict->SetString(keys::kProxyEventDetails, "");
- args.Append(dict);
-
- std::string json_args;
- base::JSONWriter::Write(&args, &json_args);
+ args->Append(dict);
if (profile) {
event_router->DispatchEventToRenderers(
- keys::kProxyEventOnProxyError, json_args, profile, true, GURL());
+ keys::kProxyEventOnProxyError, args, profile, true, GURL());
} else {
event_router->BroadcastEventToRenderers(
- keys::kProxyEventOnProxyError, json_args, GURL());
+ keys::kProxyEventOnProxyError, args, GURL());
}
}
@@ -61,7 +58,7 @@ void ProxyEventRouter::OnPACScriptError(
void* profile,
int line_number,
const string16& error) {
- ListValue args;
+ ListValue* args = new ListValue();
DictionaryValue* dict = new DictionaryValue();
dict->SetBoolean(keys::kProxyEventFatal, false);
dict->SetString(keys::kProxyEventError,
@@ -74,17 +71,14 @@ void ProxyEventRouter::OnPACScriptError(
error_msg = UTF16ToUTF8(error);
}
dict->SetString(keys::kProxyEventDetails, error_msg);
- args.Append(dict);
-
- std::string json_args;
- base::JSONWriter::Write(&args, &json_args);
+ args->Append(dict);
if (profile) {
event_router->DispatchEventToRenderers(
- keys::kProxyEventOnProxyError, json_args, profile, true, GURL());
+ keys::kProxyEventOnProxyError, args, profile, true, GURL());
} else {
event_router->BroadcastEventToRenderers(
- keys::kProxyEventOnProxyError, json_args, GURL());
+ keys::kProxyEventOnProxyError, args, GURL());
}
}

Powered by Google App Engine
This is Rietveld 408576698