Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1403)

Unified Diff: chrome/common/extensions/unpacker.cc

Issue 12025010: Move default_locale out of Extension class (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/common/extensions/unpacker.cc
diff --git a/chrome/common/extensions/unpacker.cc b/chrome/common/extensions/unpacker.cc
index 08eb09b904a28baab3a40f18f7df6a54bb6d0156..90ce3fd5a4877fc1869b0f56949a181ce140d43f 100644
--- a/chrome/common/extensions/unpacker.cc
+++ b/chrome/common/extensions/unpacker.cc
@@ -15,6 +15,7 @@
#include "base/threading/thread.h"
#include "base/utf_string_conversions.h"
#include "base/values.h"
+#include "chrome/common/extensions/api/i18n/default_locale_handler.h"
#include "chrome/common/extensions/extension.h"
#include "chrome/common/extensions/extension_file_util.h"
#include "chrome/common/extensions/extension_l10n_util.h"
@@ -202,8 +203,8 @@ bool Unpacker::Run() {
// Parse all message catalogs (if any).
parsed_catalogs_.reset(new DictionaryValue);
- if (!extension->default_locale().empty()) {
- if (!ReadAllMessageCatalogs(extension->default_locale()))
+ if (!LocaleInfo::GetDefaultLocale(extension).empty()) {
+ if (!ReadAllMessageCatalogs(LocaleInfo::GetDefaultLocale(extension)))
return false; // Error was already reported.
}

Powered by Google App Engine
This is Rietveld 408576698