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

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

Issue 10375021: Move Extension into extensions namespace (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Take 6 Created 8 years, 7 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/extension_l10n_util.cc
diff --git a/chrome/common/extensions/extension_l10n_util.cc b/chrome/common/extensions/extension_l10n_util.cc
index 117ac740657932498e1d7a914105d92b3e2b0cb7..1fa88e7eab0c718b325839129207933e616ce9ce 100644
--- a/chrome/common/extensions/extension_l10n_util.cc
+++ b/chrome/common/extensions/extension_l10n_util.cc
@@ -48,7 +48,7 @@ std::string GetDefaultLocaleFromManifest(const DictionaryValue& manifest,
}
-bool ShouldRelocalizeManifest(const ExtensionInfo& info) {
+bool ShouldRelocalizeManifest(const extensions::ExtensionInfo& info) {
DictionaryValue* manifest = info.extension_manifest.get();
if (!manifest)
return false;
@@ -206,7 +206,7 @@ bool AddLocale(const std::set<std::string>& chrome_locales,
}
// Check if messages file is actually present (but don't check content).
if (file_util::PathExists(
- locale_folder.Append(Extension::kMessagesFilename))) {
+ locale_folder.Append(extensions::Extension::kMessagesFilename))) {
valid_locales->insert(locale_name);
} else {
*error = base::StringPrintf("Catalog file is missing for locale %s.",
@@ -279,7 +279,7 @@ static DictionaryValue* LoadMessageFile(const FilePath& locale_path,
std::string* error) {
std::string extension_locale = locale;
FilePath file = locale_path.AppendASCII(extension_locale)
- .Append(Extension::kMessagesFilename);
+ .Append(extensions::Extension::kMessagesFilename);
JSONFileValueSerializer messages_serializer(file);
Value *dictionary = messages_serializer.Deserialize(NULL, error);
if (!dictionary && error->empty()) {
« no previous file with comments | « chrome/common/extensions/extension_l10n_util.h ('k') | chrome/common/extensions/extension_l10n_util_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698