Move chrome.runtime to //extensions.

apps/shell/common/shell_extensions_client.cc

 // Copyright 2013 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 "apps/shell/common/shell_extensions_client.h"
 
 #include "apps/shell/common/api/generated_schemas.h"
 #include "base/logging.h"
 #include "chrome/common/extensions/api/generated_schemas.h"
 #include "chrome/common/extensions/permissions/chrome_api_permissions.h"
 #include "extensions/common/api/generated_schemas.h"
 #include "extensions/common/api/sockets/sockets_manifest_handler.h"
 #include "extensions/common/common_manifest_handlers.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_provider.h"
 #include "extensions/common/url_pattern_set.h"
 #include "grit/app_shell_resources.h"
-#include "grit/common_resources.h"
+//#include "grit/common_resources.h"

[Ken Rockot(use gerrit already), 2014/05/03 04:22:49]

Ugh, I must have left this here. Will fix later, please ignore.

[Ken Rockot(use gerrit already), 2014/05/05 21:08:07]

Done.

 #include "grit/extensions_resources.h"
 
 using extensions::APIPermissionInfo;
 using extensions::APIPermissionSet;
 using extensions::BaseFeatureProvider;
 using extensions::Extension;
 using extensions::FeatureProvider;
 using extensions::Manifest;
 using extensions::PermissionMessage;
 using extensions::PermissionMessages;
@@ skipping 92 matching lines @@
   static ShellPermissionMessageProvider provider;
   return provider;
 }
 
 scoped_ptr<FeatureProvider> ShellExtensionsClient::CreateFeatureProvider(
     const std::string& name) const {
   extensions::JSONFeatureProviderSource source(name);
   if (name == "api") {
     source.LoadJSON(IDR_EXTENSION_API_FEATURES);
     source.LoadJSON(IDR_SHELL_EXTENSION_API_FEATURES);
-    // TODO(yoz): Don't include Chrome resources.
-    source.LoadJSON(IDR_CHROME_EXTENSION_API_FEATURES);
     return scoped_ptr<FeatureProvider>(new BaseFeatureProvider(
         source.dictionary(), CreateFeature<extensions::APIFeature>));
   } else if (name == "manifest") {
     source.LoadJSON(IDR_EXTENSION_MANIFEST_FEATURES);
-    source.LoadJSON(IDR_CHROME_EXTENSION_MANIFEST_FEATURES);
     return scoped_ptr<FeatureProvider>(new BaseFeatureProvider(
         source.dictionary(), CreateFeature<extensions::ManifestFeature>));
   } else if (name == "permission") {
     source.LoadJSON(IDR_EXTENSION_PERMISSION_FEATURES);
-    source.LoadJSON(IDR_CHROME_EXTENSION_PERMISSION_FEATURES);
     return scoped_ptr<FeatureProvider>(new BaseFeatureProvider(
         source.dictionary(), CreateFeature<extensions::PermissionFeature>));
   } else {
     NOTREACHED();
   }
   return scoped_ptr<FeatureProvider>();
 }
 
 void ShellExtensionsClient::FilterHostPermissions(
     const URLPatternSet& hosts,
@@ skipping 47 matching lines @@
   // Schema for chrome.shell APIs.
   if (apps::shell_api::GeneratedSchemas::IsGenerated(name))
     return apps::shell_api::GeneratedSchemas::Get(name);
 
   return extensions::core_api::GeneratedSchemas::Get(name);
 }
 
 bool ShellExtensionsClient::ShouldSuppressFatalErrors() const { return true; }
 
 }  // namespace apps