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

chrome/common/extensions/extension.cc

Index: chrome/common/extensions/extension.cc
===================================================================
--- chrome/common/extensions/extension.cc	(revision 21813)
+++ chrome/common/extensions/extension.cc	(working copy)
@@ -74,6 +74,8 @@
 // first 16 bytes of SHA256 hashed public key.
 const size_t Extension::kIdSize = 16;
 
+const char Extension::kMimeType[] = "application/x-chrome-extension";
+
 const int Extension::kKnownIconSizes[] = { 128 };
 
 Extension::~Extension() {
Property changes on: chrome\common\extensions\extension.cc
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk/src/chrome/common/extensions/extension.cc:r21612