Add support for app_shell-only extension APIs

extensions/shell/common/shell_extensions_client.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "extensions/shell/common/shell_extensions_client.h"
 
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "extensions/common/api/generated_schemas.h"
 #include "extensions/common/common_manifest_handlers.h"
 #include "extensions/common/extension_urls.h"
 #include "extensions/common/features/api_feature.h"
 #include "extensions/common/features/base_feature_provider.h"
 #include "extensions/common/features/json_feature_provider_source.h"
 #include "extensions/common/features/manifest_feature.h"
 #include "extensions/common/features/permission_feature.h"
 #include "extensions/common/features/simple_feature.h"
 #include "extensions/common/manifest_handler.h"
 #include "extensions/common/permissions/permission_message_provider.h"
 #include "extensions/common/permissions/permissions_info.h"
 #include "extensions/common/permissions/permissions_provider.h"
 #include "extensions/common/url_pattern_set.h"
+#include "extensions/shell/common/api/generated_schemas.h"
+#include "grit/app_shell_resources.h"
 #include "grit/extensions_resources.h"
 
 namespace extensions {
 
 namespace {
 
 template <class FeatureClass>
 SimpleFeature* CreateFeature() {
   return new FeatureClass;
 }
@@ skipping 87 matching lines @@
   return provider.Pass();
 }
 
 scoped_ptr<JSONFeatureProviderSource>
 ShellExtensionsClient::CreateFeatureProviderSource(
     const std::string& name) const {
   scoped_ptr<JSONFeatureProviderSource> source(
       new JSONFeatureProviderSource(name));
   if (name == "api") {
     source->LoadJSON(IDR_EXTENSION_API_FEATURES);
+    source->LoadJSON(IDR_SHELL_EXTENSION_API_FEATURES);
   } else if (name == "manifest") {
     source->LoadJSON(IDR_EXTENSION_MANIFEST_FEATURES);
   } else if (name == "permission") {
     source->LoadJSON(IDR_EXTENSION_PERMISSION_FEATURES);
   } else {
     NOTREACHED();
     source.reset();
   }
   return source.Pass();
 }
@@ skipping 24 matching lines @@
 }
 
 bool ShellExtensionsClient::IsScriptableURL(const GURL& url,
                                             std::string* error) const {
   NOTIMPLEMENTED();
   return true;
 }
 
 bool ShellExtensionsClient::IsAPISchemaGenerated(
     const std::string& name) const {
-  return core_api::GeneratedSchemas::IsGenerated(name);
+  return core_api::GeneratedSchemas::IsGenerated(name) ||
+         shell_api::GeneratedSchemas::IsGenerated(name);
 }
 
 base::StringPiece ShellExtensionsClient::GetAPISchema(
     const std::string& name) const {
+  // Schema for app_shell-only APIs.
+  if (shell_api::GeneratedSchemas::IsGenerated(name))
+    return shell_api::GeneratedSchemas::Get(name);
+
+  // Core extensions APIs.
   return core_api::GeneratedSchemas::Get(name);
 }
 
 void ShellExtensionsClient::RegisterAPISchemaResources(
     ExtensionAPI* api) const {
 }
 
 bool ShellExtensionsClient::ShouldSuppressFatalErrors() const {
   return true;
 }
 
 std::string ShellExtensionsClient::GetWebstoreBaseURL() const {
   return extension_urls::kChromeWebstoreBaseURL;
 }
 
 std::string ShellExtensionsClient::GetWebstoreUpdateURL() const {
   return extension_urls::kChromeWebstoreUpdateURL;
 }
 
 bool ShellExtensionsClient::IsBlacklistUpdateURL(const GURL& url) const {
   // TODO(rockot): Maybe we want to do something else here. For now we accept
   // any URL as a blacklist URL because we don't really care.
   return true;
 }
 
 }  // namespace extensions