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

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

Issue 10141008: Make managedMode extension API component-only. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 8 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/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 9d145eede0bcc9bca8b5a86d7e8d480651361374..1cadabd49e21125c3782585e689744db7bab559f 100644
--- a/chrome/common/extensions/api/extension_api.cc
+++ b/chrome/common/extensions/api/extension_api.cc
@@ -161,7 +161,7 @@ void ExtensionAPI::LoadSchema(const base::StringPiece& schema) {
CHECK(schema->GetString("namespace", &schema_namespace));
schemas_[schema_namespace] = make_linked_ptr(schema);
- unloaded_schemas_.erase(schema_namespace);
+ CHECK_EQ(1u, unloaded_schemas_.erase(schema_namespace));
// Populate |{completely,partially}_unprivileged_apis_|.
//
@@ -295,8 +295,6 @@ void ExtensionAPI::InitDefaultConfiguration() {
IDR_EXTENSION_API_JSON_EXPERIMENTAL_INPUT_VIRTUALKEYBOARD));
RegisterSchema("experimental.keybinding", ReadFromResource(
IDR_EXTENSION_API_JSON_EXPERIMENTAL_KEYBINDING));
- RegisterSchema("experimental.managedMode", ReadFromResource(
- IDR_EXTENSION_API_JSON_EXPERIMENTAL_MANAGEDMODE));
RegisterSchema("experimental.offscreenTabs", ReadFromResource(
IDR_EXTENSION_API_JSON_EXPERIMENTAL_OFFSCREENTABS));
RegisterSchema("experimental.processes", ReadFromResource(
@@ -325,6 +323,8 @@ void ExtensionAPI::InitDefaultConfiguration() {
IDR_EXTENSION_API_JSON_INPUT_IME));
RegisterSchema("inputMethodPrivate", ReadFromResource(
IDR_EXTENSION_API_JSON_INPUTMETHODPRIVATE));
+ RegisterSchema("managedModePrivate", ReadFromResource(
+ IDR_EXTENSION_API_JSON_MANAGEDMODEPRIVATE));
RegisterSchema("management", ReadFromResource(
IDR_EXTENSION_API_JSON_MANAGEMENT));
RegisterSchema("mediaPlayerPrivate", ReadFromResource(
« no previous file with comments | « chrome/common/extensions/api/experimental.managedMode.json ('k') | chrome/common/extensions/api/managedModePrivate.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698