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

chrome/common/extensions/extension.h

 // 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.
 
 #ifndef CHROME_COMMON_EXTENSIONS_EXTENSION_H_
 #define CHROME_COMMON_EXTENSIONS_EXTENSION_H_
 #pragma once
 
 #include <map>
 #include <set>
@@ skipping 88 matching lines @@
   static const char* kBookmarkPermission;
   static const char* kContextMenusPermission;
   static const char* kCookiePermission;
   static const char* kExperimentalPermission;
   static const char* kGeolocationPermission;
   static const char* kHistoryPermission;
   static const char* kIdlePermission;
   static const char* kNotificationPermission;
   static const char* kTabPermission;
   static const char* kUnlimitedStoragePermission;
+  static const char* kNativeClientPermission;
 
   static const char* kPermissionNames[];
   static const size_t kNumPermissions;
 
   // A "simple permission" is one that has a one-to-one mapping with a message
   // that is displayed in the install UI. This is in contrast to more complex
   // permissions like http access, where the exact message displayed depends on
   // several factors.
   typedef std::map<std::string, string16> SimplePermissions;
   static const SimplePermissions& GetSimplePermissions();
@@ skipping 484 matching lines @@
   scoped_ptr<DictionaryValue> extension_manifest;
   std::string extension_id;
   FilePath extension_path;
   Extension::Location extension_location;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ExtensionInfo);
 };
 
 #endif  // CHROME_COMMON_EXTENSIONS_EXTENSION_H_