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

Unified Diff: chrome/renderer/resources/extensions/miscellaneous_bindings.js

Issue 12287011: Move the chromeHidden.toJSON paranoia out of event.js and into json.js, a new (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: test fixup Created 7 years, 10 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
« no previous file with comments | « chrome/renderer/resources/extensions/json.js ('k') | chrome/renderer/resources/extensions/send_request.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/resources/extensions/miscellaneous_bindings.js
diff --git a/chrome/renderer/resources/extensions/miscellaneous_bindings.js b/chrome/renderer/resources/extensions/miscellaneous_bindings.js
index 5663271ca30514206ac95f399c689852f03572aa..147528c400c06bb37dc4d92cc493ff08e390d7cc 100644
--- a/chrome/renderer/resources/extensions/miscellaneous_bindings.js
+++ b/chrome/renderer/resources/extensions/miscellaneous_bindings.js
@@ -9,6 +9,7 @@
require('json_schema');
require('event_bindings');
+ var json = require('json');
var lastError = require('lastError');
var miscNatives = requireNative('miscellaneous_bindings');
var CloseChannel = miscNatives.CloseChannel;
@@ -52,10 +53,10 @@
// Sends a message asynchronously to the context on the other end of this
// port.
PortImpl.prototype.postMessage = function(msg) {
- // JSON.stringify doesn't support a root object which is undefined.
+ // json.stringify doesn't support a root object which is undefined.
if (msg === undefined)
msg = null;
- PostMessage(this.portId_, chromeHidden.JSON.stringify(msg));
+ PostMessage(this.portId_, json.stringify(msg));
};
// Disconnects the port from the other end.
@@ -197,7 +198,7 @@
var isExternal = sourceExtensionId != extensionId;
if (tab)
- tab = chromeHidden.JSON.parse(tab);
+ tab = json.parse(tab);
var sender = {tab: tab, id: sourceExtensionId};
// Special case for sendRequest/onRequest and sendMessage/onMessage.
@@ -249,7 +250,7 @@
var port = ports[portId];
if (port) {
if (msg) {
- msg = chromeHidden.JSON.parse(msg);
+ msg = json.parse(msg);
}
port.onMessage.dispatch(msg, port);
}
« no previous file with comments | « chrome/renderer/resources/extensions/json.js ('k') | chrome/renderer/resources/extensions/send_request.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698