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

Unified Diff: chrome/common/extensions/api/extension_api.cc

Issue 9359040: WIP IDL-IPC2 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Checkpoint before going back to returning ListValue via ExtensionMsg_Response. Created 8 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/common/common_resources.grd ('k') | chrome/common/extensions/api/generated.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/extensions/api/extension_api.cc
diff --git a/chrome/common/extensions/api/extension_api.cc b/chrome/common/extensions/api/extension_api.cc
index 14a6562b99de513511a1df06b2e63b78147958c1..40773c38304bad745dc5903a6570dfc965b190c0 100644
--- a/chrome/common/extensions/api/extension_api.cc
+++ b/chrome/common/extensions/api/extension_api.cc
@@ -75,7 +75,6 @@ static base::ListValue* LoadSchemaList(int resource_id) {
kAllowTrailingCommas,
NULL, // error code
&error_message);
- CHECK(result) << error_message;
CHECK(result->IsType(base::Value::TYPE_LIST));
return static_cast<base::ListValue*>(result);
}
@@ -127,11 +126,12 @@ ExtensionAPI::ExtensionAPI() {
IDR_EXTENSION_API_JSON_EXTENSION,
IDR_EXTENSION_API_JSON_FILEBROWSERHANDLER,
IDR_EXTENSION_API_JSON_FILEBROWSERPRIVATE,
+ IDR_EXTENSION_API_JSON_GENERATED,
IDR_EXTENSION_API_JSON_HISTORY,
IDR_EXTENSION_API_JSON_I18N,
IDR_EXTENSION_API_JSON_IDLE,
- IDR_EXTENSION_API_JSON_INPUT_IME,
IDR_EXTENSION_API_JSON_INPUTMETHODPRIVATE,
+ IDR_EXTENSION_API_JSON_INPUT_IME,
IDR_EXTENSION_API_JSON_MANAGEMENT,
IDR_EXTENSION_API_JSON_MEDIAPLAYERPRIVATE,
IDR_EXTENSION_API_JSON_METRICSPRIVATE,
« no previous file with comments | « chrome/common/common_resources.grd ('k') | chrome/common/extensions/api/generated.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698