Adding the --load-component-extension flag.

chrome/common/extensions/extension.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.h"
 
 #include <algorithm>
 
 #include "base/base64.h"
 #include "base/basictypes.h"
@@ skipping 2040 matching lines @@
 #if defined(USE_VIRTUAL_KEYBOARD)
            page != chrome::kChromeUIKeyboardHost &&
 #endif
 #if defined(OS_CHROMEOS)
            page != chrome::kChromeUIActivationMessageHost &&
 #endif
            page != chrome::kChromeUIBookmarksHost &&
            page != chrome::kChromeUIHistoryHost
 #if defined(FILE_MANAGER_EXTENSION)
                &&
-           !(location() ==  COMPONENT &&
+           !(CanSpecifyComponentOnlyPermission() &&
              page == chrome::kChromeUIFileManagerHost)
 #endif
           ) ||
           !overrides->GetStringWithoutPathExpansion(*iter, &val)) {
         *error = errors::kInvalidChromeURLOverrides;
         return false;
       }
       // Replace the entry with a fully qualified chrome-extension:// URL.
       chrome_url_overrides_[page] = GetResourceURL(val);
     }
@@ skipping 794 matching lines @@
   return true;
 }
 
 bool Extension::CanSpecifyComponentOnlyPermission() const {
   // Only COMPONENT extensions can use private APIs.
   // TODO(asargent) - We want a more general purpose mechanism for this,
   // and better error messages. (http://crbug.com/54013)
   if (location_ == Extension::COMPONENT)
     return true;
 
-#ifndef NDEBUG
-  if (CommandLine::ForCurrentProcess()->HasSwitch(
+  if (location_ == Extension::LOAD &&
+      CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kExposePrivateExtensionApi)) {
     return true;
   }
-#endif
 
   return false;
 }
 
 bool Extension::CanSpecifyExperimentalPermission() const {
   if (location_ == Extension::COMPONENT)
     return true;
 
   if (CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableExperimentalExtensionApis)) {
@@ skipping 14 matching lines @@
   if (location_ == Extension::COMPONENT)
     return true;
 
   if (permission->is_hosted_app())
     return true;
 
   return false;
 }
 
 bool Extension::CanExecuteScriptEverywhere() const {
-  if (location() == Extension::COMPONENT
-#ifndef NDEBUG
-      || CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kExposePrivateExtensionApi)
-#endif
+  if (location() == Extension::COMPONENT ||
+      (location() == Extension::LOAD &&
+       CommandLine::ForCurrentProcess()->HasSwitch(
+           switches::kExposePrivateExtensionApi)
       )

[Aaron Boodman, 2011/11/28 18:29:59]

Nit: these parens should be up on line 2918.

[SeRya, 2011/11/28 23:49:53]

Done.

+     )
     return true;
 
   ScriptingWhitelist* whitelist =
       ExtensionConfig::GetInstance()->whitelist();
 
   for (ScriptingWhitelist::const_iterator it = whitelist->begin();
        it != whitelist->end(); ++it) {
     if (id() == *it) {
       return true;
     }
@@ skipping 120 matching lines @@
     already_disabled(false),
     extension(extension) {}
 
 UpdatedExtensionPermissionsInfo::UpdatedExtensionPermissionsInfo(
     const Extension* extension,
     const ExtensionPermissionSet* permissions,
     Reason reason)
     : reason(reason),
       extension(extension),
       permissions(permissions) {}