summaryrefslogtreecommitdiffstats
path: root/chrome/common
diff options
context:
space:
mode:
authoraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-17 01:08:13 +0000
committeraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-17 01:08:13 +0000
commit584245e578427abc2bc19f224609f820ad71aca0 (patch)
treef9b61a739b3966bf1fd7d0aa99ef85416df57bac /chrome/common
parentcfa8228c292f94603173a15317118fabe8502143 (diff)
downloadchromium_src-584245e578427abc2bc19f224609f820ad71aca0.zip
chromium_src-584245e578427abc2bc19f224609f820ad71aca0.tar.gz
chromium_src-584245e578427abc2bc19f224609f820ad71aca0.tar.bz2
Allow themes to be localized. This doesn't show up anywhere
in Chrome (yet), but it is used by the gallery. BUG=46379 Review URL: http://codereview.chromium.org/2845010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50062 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
-rw-r--r--chrome/common/extensions/extension.cc2
-rw-r--r--chrome/common/extensions/extension_l10n_util.cc4
2 files changed, 2 insertions, 4 deletions
diff --git a/chrome/common/extensions/extension.cc b/chrome/common/extensions/extension.cc
index 4a6bac3..a5780c2 100644
--- a/chrome/common/extensions/extension.cc
+++ b/chrome/common/extensions/extension.cc
@@ -92,6 +92,8 @@ const FilePath::CharType Extension::kMessagesFilename[] =
// A list of all the keys allowed by themes.
static const wchar_t* kValidThemeKeys[] = {
+ keys::kCurrentLocale,
+ keys::kDefaultLocale,
keys::kDescription,
keys::kName,
keys::kPublicKey,
diff --git a/chrome/common/extensions/extension_l10n_util.cc b/chrome/common/extensions/extension_l10n_util.cc
index 2848d8f..b9c2b1c 100644
--- a/chrome/common/extensions/extension_l10n_util.cc
+++ b/chrome/common/extensions/extension_l10n_util.cc
@@ -79,10 +79,6 @@ static bool LocalizeManifestValue(const std::wstring& key,
bool LocalizeManifest(const ExtensionMessageBundle& messages,
DictionaryValue* manifest,
std::string* error) {
- // Don't localize themes.
- if (manifest->HasKey(keys::kTheme))
- return true;
-
// Initialize name.
std::string result;
if (!manifest->GetString(keys::kName, &result)) {