chrome/common/extensions/extension_l10n_util.cc - Issue 19547009: Move ".crx"/".pem" constants and extension_filenames constants into extensions/common/constants.cc.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 19547009: Move ".crx"/".pem" constants and extension_filenames constants into extensions/common/constants.cc. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 5 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

« no previous file with comments | « chrome/common/extensions/extension_file_util_unittest.cc ('k') | chrome/common/extensions/extension_l10n_util_unittest.cc » ('j') | extensions/common/constants.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 ac4b4baa75fed2e5f6c347a1e2acc247ce9f6687..b3ef3834a6711d6802e30f317f9aed9dea3ed7dd 100644

--- a/chrome/common/extensions/extension_l10n_util.cc

+++ b/chrome/common/extensions/extension_l10n_util.cc

@@ -212,7 +212,7 @@ bool AddLocale(const std::set<std::string>& chrome_locales,

}

// Check if messages file is actually present (but don't check content).

if (base::PathExists(

- locale_folder.Append(extensions::kMessagesFilename))) {

+ locale_folder.Append(extensions::filenames::kMessagesFilename))) {

valid_locales->insert(locale_name);

} else {

*error = base::StringPrintf("Catalog file is missing for locale %s.",

@@ -295,7 +295,7 @@ static base::DictionaryValue* LoadMessageFile(

std::string* error) {

std::string extension_locale = locale;

base::FilePath file = locale_path.AppendASCII(extension_locale)

- .Append(extensions::kMessagesFilename);

+ .Append(extensions::filenames::kMessagesFilename);

JSONFileValueSerializer messages_serializer(file);

base::Value *dictionary = messages_serializer.Deserialize(NULL, error);

if (!dictionary && error->empty()) {