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

Unified Diff: chrome/renderer/extensions/dispatcher.cc

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/chrome_tests_unit.gypi ('k') | chrome/renderer/extensions/json_js_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/extensions/dispatcher.cc
diff --git a/chrome/renderer/extensions/dispatcher.cc b/chrome/renderer/extensions/dispatcher.cc
index 879214819d3f693d4b6273129ae0b4d731a9fee5..dcd161f2882601b4a22f1d81bddf5703b8b32d0c 100644
--- a/chrome/renderer/extensions/dispatcher.cc
+++ b/chrome/renderer/extensions/dispatcher.cc
@@ -626,6 +626,7 @@ void Dispatcher::PopulateSourceMap() {
IDR_MISCELLANEOUS_BINDINGS_JS);
source_map_.RegisterSource("schema_generated_bindings",
IDR_SCHEMA_GENERATED_BINDINGS_JS);
+ source_map_.RegisterSource("json", IDR_JSON_JS);
source_map_.RegisterSource("json_schema", IDR_JSON_SCHEMA_JS);
source_map_.RegisterSource("apitest", IDR_EXTENSION_APITEST_JS);
@@ -803,6 +804,7 @@ void Dispatcher::DidCreateScriptContext(
case Feature::BLESSED_EXTENSION_CONTEXT:
case Feature::UNBLESSED_EXTENSION_CONTEXT:
case Feature::CONTENT_SCRIPT_CONTEXT: {
+ module_system->Require("json"); // see paranoid comment in json.js
module_system->Require("miscellaneous_bindings");
module_system->Require("schema_generated_bindings");
module_system->Require("apitest");
« no previous file with comments | « chrome/chrome_tests_unit.gypi ('k') | chrome/renderer/extensions/json_js_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698