Merge 21612 - Implement mimetype sniffing for extensions....

chrome/common/extensions/extension.h

Index: chrome/common/extensions/extension.h
===================================================================
--- chrome/common/extensions/extension.h	(revision 21813)
+++ chrome/common/extensions/extension.h	(working copy)
@@ -64,13 +64,13 @@
   // The number of bytes in a legal id.
   static const size_t kIdSize;
 
+  // The mimetype used for extensions.
+  static const char kMimeType[];
+
   Extension() : location_(INVALID), is_theme_(false) {}
   explicit Extension(const FilePath& path);
   virtual ~Extension();
 
-  // Returns true if the specified file is an extension.
-  static bool IsExtension(const FilePath& file_name);
-
   // Resets the id counter. This is only useful for unit tests.
   static void ResetGeneratedIdCounter() {
     id_counter_ = 0;
@@ -79,6 +79,9 @@
   // Checks to see if the extension has a valid ID.
   static bool IdIsValid(const std::string& id);
 
+  // Returns true if the specified file is an extension.
+  static bool IsExtension(const FilePath& file_name);
+
   // Whether the |location| is external or not.
   static inline bool IsExternalLocation(Location location) {
     return location == Extension::EXTERNAL_PREF ||
Property changes on: chrome\common\extensions\extension.h
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk/src/chrome/common/extensions/extension.h:r21612