Reland restrict extension features based on the extension type.

chrome/common/extensions/extension_constants.cc

 // Copyright (c) 2011 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 "chrome/common/extensions/extension_constants.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/string_util.h"
@@ skipping 148 matching lines @@
     "This extension requires * version * or greater.";
 const char kDisabledByPolicy[] =
     "This extension has been disabled by your administrator.";
 const char kDevToolsExperimental[] =
     "You must request the 'experimental' permission in order to use the"
     " DevTools API.";
 const char kExpectString[] = "Expect string value.";
 const char kExperimentalFlagRequired[] =
     "Loading extensions with 'experimental' permission requires"
     " --enable-experimental-extension-apis command line flag.";
-const char kHostedAppsCannotIncludeExtensionFeatures[] =
-    "Hosted apps cannot use the extension feature '*'.";
+const char kFeatureNotAllowed[] =
+    "Feature '*' is not allowed in this type of manifest.";
 const char kInvalidAllFrames[] =
     "Invalid value for 'content_scripts[*].all_frames'.";
 const char kInvalidBackground[] =
     "Invalid value for 'background_page'.";
 const char kInvalidBackgroundInHostedApp[] =
     "Invalid value for 'background_page'. Hosted apps must specify an "
     "absolute HTTPS URL for the background page.";
 const char kInvalidBrowserAction[] =
     "Invalid value for 'browser_action'.";
 const char kInvalidChromeURLOverrides[] =
@@ skipping 241 matching lines @@
   "Wildcards are not allowed in extent URL pattern paths.";
 const char kOneUISurfaceOnly[] =
     "Only one of 'browser_action', 'page_action', and 'app' can be specified.";
 const char kPermissionNotAllowed[] =
     "Access to permission '*' denied.";
 const char kReservedMessageFound[] =
     "Reserved key * found in message catalog.";
 const char kSidebarExperimental[] =
     "You must request the 'experimental' permission in order to use the"
     " Sidebar API.";
-const char kThemesCannotContainExtensions[] =
-    "A theme cannot contain extensions code.";
 #if defined(OS_CHROMEOS)
 const char kIllegalPlugins[] =
     "Extensions cannot install plugins on Chrome OS";
 #endif
 }  // namespace extension_manifest_errors
 
 namespace extension_urls {
 std::string GetWebstoreLaunchURL() {
   std::string gallery_prefix = kGalleryBrowsePrefix;
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAppsGalleryURL))
@@ skipping 45 matching lines @@
 const char kCloudPrintAppId[] = "mfehgcgbbipciphmccgaenjidiccnmng";
 const char kAppsPromoHistogram[] = "Extensions.AppsPromo";
 const char kAppLaunchHistogram[] = "Extensions.AppLaunch";
 #if defined(OS_CHROMEOS)
 const char kAccessExtensionPath[] =
     "/usr/share/chromeos-assets/accessibility/extensions";
 const char kChromeVoxDirectoryName[] = "access_chromevox";
 #endif
 
 }