Upstream version 7.35.144.0

[platform/framework/web/crosswalk.git] / src / chrome / common / extensions / extension_l10n_util.cc

diff --git a/src/chrome/common/extensions/extension_l10n_util.cc b/src/chrome/common/extensions/extension_l10n_util.cc
index bc3c229..38891ba 100644 (file)
--- a/src/chrome/common/extensions/extension_l10n_util.cc
+++ b/src/chrome/common/extensions/extension_l10n_util.cc
@@ -240,12 +240,13 @@ bool LocalizeManifest(const extensions::MessageBundle& messages,
 
   // Initialize search_provider fields.
   base::DictionaryValue* search_provider = NULL;
-  if (manifest->GetDictionary(keys::kSearchProvider, &search_provider)) {
+  if (manifest->GetDictionary(keys::kOverrideSearchProvider,
+                              &search_provider)) {
     for (base::DictionaryValue::Iterator iter(*search_provider);
          !iter.IsAtEnd();
          iter.Advance()) {
-      key.assign(base::StringPrintf("%s.%s", keys::kSearchProvider,
-                                    iter.key().c_str()));
+      key.assign(base::StringPrintf(
+          "%s.%s", keys::kOverrideSearchProvider, iter.key().c_str()));
       bool success = (key == keys::kSettingsOverrideAlternateUrls) ?
           LocalizeManifestListValue(key, messages, manifest, error) :
           LocalizeManifestValue(key, messages, manifest, error);
@@ -254,6 +255,16 @@ bool LocalizeManifest(const extensions::MessageBundle& messages,
     }
   }
 
+  // Initialize chrome_settings_overrides.homepage.
+  if (!LocalizeManifestValue(
+          keys::kOverrideHomepage, messages, manifest, error))
+    return false;
+
+  // Initialize chrome_settings_overrides.startup_pages.
+  if (!LocalizeManifestListValue(
+          keys::kOverrideStartupPage, messages, manifest, error))
+    return false;
+
   // Add current locale key to the manifest, so we can overwrite prefs
   // with new manifest when chrome locale changes.
   manifest->SetString(keys::kCurrentLocale, CurrentLocaleOrDefault());