[MD settings] i18n template replacements in shared HTML resources

chrome/browser/ui/webui/options/options_ui.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/options/options_ui.h"
 
 #include <algorithm>
 #include <utility>
 #include <vector>
 
@@ skipping 157 matching lines @@
   void StartDataRequest(
       const std::string& path,
       const content::ResourceRequestInfo::WebContentsGetter& wc_getter,
       const content::URLDataSource::GotDataCallback& callback) override;
   std::string GetMimeType(const std::string&) const override;
   bool ShouldDenyXFrameOptions() const override;
 
  private:
   ~OptionsUIHTMLSource() override;
   void CreateDataSourceMap();
-  void AddReplacements(base::DictionaryValue* localized_strings);
 
   // Localized strings collection.
   std::unique_ptr<base::DictionaryValue> localized_strings_;
   std::map<std::string, int> path_to_idr_map_;
   ui::TemplateReplacements replacements_;
 
   DISALLOW_COPY_AND_ASSIGN(OptionsUIHTMLSource);
 };
 
 OptionsUIHTMLSource::OptionsUIHTMLSource(
     base::DictionaryValue* localized_strings) {
   DCHECK(localized_strings);
-  AddReplacements(localized_strings);
   localized_strings_.reset(localized_strings);
   CreateDataSourceMap();
 }
 
 std::string OptionsUIHTMLSource::GetSource() const {
   return chrome::kChromeUISettingsFrameHost;
 }
 
 void OptionsUIHTMLSource::StartDataRequest(
     const std::string& path,
     const content::ResourceRequestInfo::WebContentsGetter& wc_getter,
     const content::URLDataSource::GotDataCallback& callback) {
   scoped_refptr<base::RefCountedMemory> response_bytes;
   const std::string& app_locale = g_browser_process->GetApplicationLocale();
   webui::SetLoadTimeDataDefaults(app_locale, localized_strings_.get());
+  ui::TemplateReplacementsFromDictionaryValue(*(localized_strings_.get()),

[Dan Beam, 2017/01/04 22:41:20]

nit: just *localized_strings_

[dschuyler, 2017/01/04 23:18:29]

Done.

+                                              &replacements_);
 
   std::map<std::string, int>::iterator result;
   result = path_to_idr_map_.find(path);
 
   if (path == kLocalizedStringsFile) {
     // Return dynamically-generated strings from memory.
     std::string strings_js;
     webui::AppendJsonJS(localized_strings_.get(), &strings_js);
     response_bytes = base::RefCountedString::TakeString(&strings_js);
   } else if (path == kOptionsBundleJsFile) {
@@ skipping 63 matching lines @@
   path_to_idr_map_[kSettingsPrefsBehaviorHTMLPath] =
       IDR_SETTINGS_PREFS_BEHAVIOR_HTML;
   path_to_idr_map_[kSettingsPrefsBehaviorJSPath] =
       IDR_SETTINGS_PREFS_BEHAVIOR_JS;
   path_to_idr_map_[kSettingsPrefsTypesHTMLPath] = IDR_SETTINGS_PREFS_TYPES_HTML;
   path_to_idr_map_[kSettingsPrefsTypesJSPath] = IDR_SETTINGS_PREFS_TYPES_JS;
   path_to_idr_map_[kOptionsPolymerHTMLPath] = IDR_OPTIONS_POLYMER_ELEMENTS_HTML;
 #endif
 }
 
-void OptionsUIHTMLSource::AddReplacements(
-    base::DictionaryValue* localized_strings) {
-  for (auto it = base::DictionaryValue::Iterator(*localized_strings);
-       !it.IsAtEnd(); it.Advance()) {
-    std::string str_value;
-    if (!it.value().GetAsString(&str_value)) {
-      continue;
-    }
-    replacements_[it.key()] = str_value;
-  }
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 //
 // OptionsPageUIHandler
 //
 ////////////////////////////////////////////////////////////////////////////////
 
 OptionsPageUIHandler::OptionsPageUIHandler() {
 }
 
 OptionsPageUIHandler::~OptionsPageUIHandler() {
@@ skipping 264 matching lines @@
   // Add only if handler's service is enabled.
   if (handler->IsEnabled()) {
     // Add handler to the list and also pass the ownership.
     web_ui()->AddMessageHandler(handler.release());
     handler_raw->GetLocalizedValues(localized_strings);
     handlers_.push_back(handler_raw);
   }
 }
 
 }  // namespace options