Rename DictionaryValue's SetStringFromUTF16() to SetString() (and overload).

chrome/browser/dom_ui/history_ui.cc

 // Copyright (c) 2010 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/dom_ui/history_ui.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/callback.h"
 #include "base/i18n/time_formatting.h"
@@ skipping 36 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 
 HistoryUIHTMLSource::HistoryUIHTMLSource()
     : DataSource(chrome::kChromeUIHistoryHost, MessageLoop::current()) {
 }
 
 void HistoryUIHTMLSource::StartDataRequest(const std::string& path,
                                            bool is_off_the_record,
                                            int request_id) {
   DictionaryValue localized_strings;
-  localized_strings.SetString(L"loading",
-      l10n_util::GetString(IDS_HISTORY_LOADING));
-  localized_strings.SetString(L"title",
-      l10n_util::GetString(IDS_HISTORY_TITLE));
-  localized_strings.SetString(L"loading",
-      l10n_util::GetString(IDS_HISTORY_LOADING));
-  localized_strings.SetString(L"newest",
-      l10n_util::GetString(IDS_HISTORY_NEWEST));
-  localized_strings.SetString(L"newer",
-      l10n_util::GetString(IDS_HISTORY_NEWER));
-  localized_strings.SetString(L"older",
-      l10n_util::GetString(IDS_HISTORY_OLDER));
-  localized_strings.SetString(L"searchresultsfor",
-      l10n_util::GetString(IDS_HISTORY_SEARCHRESULTSFOR));
-  localized_strings.SetString(L"history",
-      l10n_util::GetString(IDS_HISTORY_BROWSERESULTS));
-  localized_strings.SetString(L"cont",
-      l10n_util::GetString(IDS_HISTORY_CONTINUED));
-  localized_strings.SetString(L"searchbutton",
-      l10n_util::GetString(IDS_HISTORY_SEARCH_BUTTON));
-  localized_strings.SetString(L"noresults",
-      l10n_util::GetString(IDS_HISTORY_NO_RESULTS));
-  localized_strings.SetString(L"noitems",
-      l10n_util::GetString(IDS_HISTORY_NO_ITEMS));
-  localized_strings.SetString(L"edithistory",
-      l10n_util::GetString(IDS_HISTORY_START_EDITING_HISTORY));
-  localized_strings.SetString(L"doneediting",
-      l10n_util::GetString(IDS_HISTORY_STOP_EDITING_HISTORY));
-  localized_strings.SetString(L"removeselected",
-      l10n_util::GetString(IDS_HISTORY_REMOVE_SELECTED_ITEMS));
-  localized_strings.SetString(L"clearallhistory",
-      l10n_util::GetString(IDS_HISTORY_OPEN_CLEAR_BROWSING_DATA_DIALOG));
-  localized_strings.SetString(L"deletewarning",
-      l10n_util::GetString(IDS_HISTORY_DELETE_PRIOR_VISITS_WARNING));
+  localized_strings.SetString("loading",
+      l10n_util::GetStringUTF16(IDS_HISTORY_LOADING));
+  localized_strings.SetString("title",
+      l10n_util::GetStringUTF16(IDS_HISTORY_TITLE));
+  localized_strings.SetString("loading",
+      l10n_util::GetStringUTF16(IDS_HISTORY_LOADING));
+  localized_strings.SetString("newest",
+      l10n_util::GetStringUTF16(IDS_HISTORY_NEWEST));
+  localized_strings.SetString("newer",
+      l10n_util::GetStringUTF16(IDS_HISTORY_NEWER));
+  localized_strings.SetString("older",
+      l10n_util::GetStringUTF16(IDS_HISTORY_OLDER));
+  localized_strings.SetString("searchresultsfor",
+      l10n_util::GetStringUTF16(IDS_HISTORY_SEARCHRESULTSFOR));
+  localized_strings.SetString("history",
+      l10n_util::GetStringUTF16(IDS_HISTORY_BROWSERESULTS));
+  localized_strings.SetString("cont",
+      l10n_util::GetStringUTF16(IDS_HISTORY_CONTINUED));
+  localized_strings.SetString("searchbutton",
+      l10n_util::GetStringUTF16(IDS_HISTORY_SEARCH_BUTTON));
+  localized_strings.SetString("noresults",
+      l10n_util::GetStringUTF16(IDS_HISTORY_NO_RESULTS));
+  localized_strings.SetString("noitems",
+      l10n_util::GetStringUTF16(IDS_HISTORY_NO_ITEMS));
+  localized_strings.SetString("edithistory",
+      l10n_util::GetStringUTF16(IDS_HISTORY_START_EDITING_HISTORY));
+  localized_strings.SetString("doneediting",
+      l10n_util::GetStringUTF16(IDS_HISTORY_STOP_EDITING_HISTORY));
+  localized_strings.SetString("removeselected",
+      l10n_util::GetStringUTF16(IDS_HISTORY_REMOVE_SELECTED_ITEMS));
+  localized_strings.SetString("clearallhistory",
+      l10n_util::GetStringUTF16(IDS_HISTORY_OPEN_CLEAR_BROWSING_DATA_DIALOG));
+  localized_strings.SetString("deletewarning",
+      l10n_util::GetStringUTF16(IDS_HISTORY_DELETE_PRIOR_VISITS_WARNING));
 
   SetFontAndTextDirection(&localized_strings);
 
   static const base::StringPiece history_html(
       ResourceBundle::GetSharedInstance().GetRawDataResource(
           IDR_HISTORY_HTML));
   const std::string full_html = jstemplate_builder::GetI18nTemplateHtml(
       history_html, &localized_strings);
 
   scoped_refptr<RefCountedBytes> html_bytes(new RefCountedBytes);
@@ skipping 144 matching lines @@
 
   ListValue results_value;
   base::Time midnight_today = base::Time::Now().LocalMidnight();
 
   for (size_t i = 0; i < results->size(); ++i) {
     history::URLResult const &page = (*results)[i];
     DictionaryValue* page_value = new DictionaryValue();
     SetURLAndTitle(page_value, page.title(), page.url());
 
     // Need to pass the time in epoch time (fastest JS conversion).
-    page_value->SetInteger(L"time",
+    page_value->SetInteger("time",
         static_cast<int>(page.visit_time().ToTimeT()));
 
     // Until we get some JS i18n infrastructure, we also need to
     // pass the dates in as strings. This could use some
     // optimization.
 
     // Only pass in the strings we need (search results need a shortdate
     // and snippet, browse results need day and time information).
     if (search_text_.empty()) {
       // Figure out the relative date string.
       std::wstring date_str = TimeFormat::RelativeDate(page.visit_time(),
                                                        &midnight_today);
       if (date_str.empty()) {
         date_str = base::TimeFormatFriendlyDate(page.visit_time());
       } else {
         date_str = l10n_util::GetStringF(
             IDS_HISTORY_DATE_WITH_RELATIVE_TIME,
             date_str, base::TimeFormatFriendlyDate(page.visit_time()));
       }
-      page_value->SetString(L"dateRelativeDay", date_str);
-      page_value->SetString(L"dateTimeOfDay",
-          base::TimeFormatTimeOfDay(page.visit_time()));
+      page_value->SetString("dateRelativeDay", WideToUTF16Hack(date_str));
+      page_value->SetString("dateTimeOfDay",
+          WideToUTF16Hack(base::TimeFormatTimeOfDay(page.visit_time())));
     } else {
-      page_value->SetString(L"dateShort",
-          base::TimeFormatShortDate(page.visit_time()));
-      page_value->SetStringFromUTF16(L"snippet", page.snippet().text());
+      page_value->SetString("dateShort",
+          WideToUTF16Hack(base::TimeFormatShortDate(page.visit_time())));
+      page_value->SetString("snippet", page.snippet().text());
     }
-    page_value->SetBoolean(L"starred",
+    page_value->SetBoolean("starred",
         dom_ui_->GetProfile()->GetBookmarkModel()->IsBookmarked(page.url()));
     results_value.Append(page_value);
   }
 
   DictionaryValue info_value;
-  info_value.SetStringFromUTF16(L"term", search_text_);
-  info_value.SetBoolean(L"finished", results->reached_beginning());
+  info_value.SetString("term", search_text_);
+  info_value.SetBoolean("finished", results->reached_beginning());
 
   dom_ui_->CallJavascriptFunction(L"historyResult", info_value, results_value);
 }
 
 void BrowsingHistoryHandler::RemoveComplete() {
   // Some Visits were deleted from history. Reload the list.
   dom_ui_->CallJavascriptFunction(L"deleteComplete");
 }
 
 void BrowsingHistoryHandler::ExtractSearchHistoryArguments(const Value* value,
@@ skipping 104 matching lines @@
 const GURL HistoryUI::GetHistoryURLWithSearchText(const string16& text) {
   return GURL(std::string(chrome::kChromeUIHistoryURL) + "#q=" +
               EscapeQueryParamValue(UTF16ToUTF8(text), true));
 }
 
 // static
 RefCountedMemory* HistoryUI::GetFaviconResourceBytes() {
   return ResourceBundle::GetSharedInstance().
       LoadDataResourceBytes(IDR_HISTORY_FAVICON);
 }