summaryrefslogtreecommitdiffstats
path: root/chrome/renderer/extensions/dispatcher.h
diff options
context:
space:
mode:
authorkalman@chromium.org <kalman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-21 02:56:02 +0000
committerkalman@chromium.org <kalman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-21 02:56:02 +0000
commit5322973d577a1064bb32eb19bd01c6aa5e7c51a5 (patch)
tree43f6b82ae3b489cbf90473b180200e0120791b8c /chrome/renderer/extensions/dispatcher.h
parent768c0ff262cb7af622df394e9f2c1dbfe53e0162 (diff)
downloadchromium_src-5322973d577a1064bb32eb19bd01c6aa5e7c51a5.zip
chromium_src-5322973d577a1064bb32eb19bd01c6aa5e7c51a5.tar.gz
chromium_src-5322973d577a1064bb32eb19bd01c6aa5e7c51a5.tar.bz2
Go back to JSON serialization of extension messages. base::Value pickling was
causing OOMs on the browser, and V8ValueConverter has bugs. This is effectively a revert of both r204067 and r204496, except the json library replaced by the new safe $JSON, and it's eagerly included via our small-footprint v8::Extension. BUG=247530,248019,249419 R=mpcomplete@chromium.org TBR=cdn@chromium.org Review URL: https://chromiumcodereview.appspot.com/17144003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@207675 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/extensions/dispatcher.h')
-rw-r--r--chrome/renderer/extensions/dispatcher.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/renderer/extensions/dispatcher.h b/chrome/renderer/extensions/dispatcher.h
index 2d81dff..80cd0ee 100644
--- a/chrome/renderer/extensions/dispatcher.h
+++ b/chrome/renderer/extensions/dispatcher.h
@@ -164,7 +164,7 @@ class Dispatcher : public content::RenderProcessObserver {
const std::string& channel_name,
const base::DictionaryValue& source_tab,
const ExtensionMsg_ExternalConnectionInfo& info);
- void OnDeliverMessage(int target_port_id, const base::ListValue& message);
+ void OnDeliverMessage(int target_port_id, const std::string& message);
void OnDispatchOnDisconnect(int port_id, const std::string& error_message);
void OnSetFunctionNames(const std::vector<std::string>& names);
void OnSetSystemFont(const std::string& font_family,