Altered the logic that determines when NaCl is enabled. Previously, we requi...

chrome/common/extensions/extension.cc

 // Copyright (c) 2010 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 "app/l10n_util.h"
 #include "base/base64.h"
@@ skipping 104 matching lines @@
 const char* Extension::kContextMenusPermission = "contextMenus";
 const char* Extension::kBookmarkPermission = "bookmarks";
 const char* Extension::kCookiePermission = "cookies";
 const char* Extension::kExperimentalPermission = "experimental";
 const char* Extension::kGeolocationPermission = "geolocation";
 const char* Extension::kHistoryPermission = "history";
 const char* Extension::kIdlePermission = "idle";
 const char* Extension::kNotificationPermission = "notifications";
 const char* Extension::kTabPermission = "tabs";
 const char* Extension::kUnlimitedStoragePermission = "unlimited_storage";
+const char* Extension::kNativeClientPermission = "native_client";
 
 const char* Extension::kPermissionNames[] = {
   Extension::kBackgroundPermission,
   Extension::kBookmarkPermission,
   Extension::kContextMenusPermission,
   Extension::kCookiePermission,
   Extension::kExperimentalPermission,
   Extension::kGeolocationPermission,
   Extension::kIdlePermission,
   Extension::kHistoryPermission,
   Extension::kNotificationPermission,
   Extension::kTabPermission,
   Extension::kUnlimitedStoragePermission,
+  Extension::kNativeClientPermission,
 };
 const size_t Extension::kNumPermissions =
     arraysize(Extension::kPermissionNames);
 
 const Extension::SimplePermissions& Extension::GetSimplePermissions() {
   static SimplePermissions permissions;
   if (permissions.empty()) {
     permissions[Extension::kBookmarkPermission] =
         l10n_util::GetStringUTF16(
             IDS_EXTENSION_PROMPT2_WARNING_BOOKMARKS);
@@ skipping 1581 matching lines @@
         } else {
           return false;
         }
       } else {
         return true;
       }
     }
   }
   return false;
 }