Merge 32345 - Parse messages.json in ExtensionUnpacker (like we do for manife...

chrome/common/extensions/extension.h

Index: chrome/common/extensions/extension.h
===================================================================
--- chrome/common/extensions/extension.h	(revision 35541)
+++ chrome/common/extensions/extension.h	(working copy)
@@ -283,6 +283,8 @@
     message_bundle_.reset(message_bundle);
   }
 
+  const std::string default_locale() const { return default_locale_; }
+
   // Chrome URL overrides (see ExtensionOverrideUI).
   const URLOverrideMap& GetChromeURLOverrides() const {
     return chrome_url_overrides_;
@@ -415,6 +417,9 @@
   // Handles the l10n messages replacement and parsing.
   scoped_ptr<ExtensionMessageBundle> message_bundle_;
 
+  // Default locale for fall back. Can be empty if extension is not localized.
+  std::string default_locale_;
+
   // A map of chrome:// hostnames (newtab, downloads, etc.) to Extension URLs
   // which override the handling of those URLs.
   URLOverrideMap chrome_url_overrides_;