Port DictionaryValue to use string16 instead of wstring.

chrome/browser/dom_ui/history_ui.cc

 // Copyright (c) 2006-2008 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 "base/message_loop.h"
 #include "base/string_piece.h"
 #include "base/string_util.h"
 #include "base/thread.h"
@@ skipping 31 matching lines @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
 HistoryUIHTMLSource::HistoryUIHTMLSource()
     : DataSource(kHistoryHost, MessageLoop::current()) {
 }
 
 void HistoryUIHTMLSource::StartDataRequest(const std::string& path,
                                            int request_id) {
   DictionaryValue localized_strings;
-  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"deleteday",
-      l10n_util::GetString(IDS_HISTORY_DELETE_PRIOR_VISITS_LINK));
-  localized_strings.SetString(L"deletedaywarning",
-      l10n_util::GetString(IDS_HISTORY_DELETE_PRIOR_VISITS_WARNING));
+  localized_strings.SetString(ASCIIToUTF16("title"),
+      WideToUTF16Hack(l10n_util::GetString(IDS_HISTORY_TITLE)));
+  localized_strings.SetString(ASCIIToUTF16("loading"),
+      WideToUTF16Hack(l10n_util::GetString(IDS_HISTORY_LOADING)));
+  localized_strings.SetString(ASCIIToUTF16("newest"),
+      WideToUTF16Hack(l10n_util::GetString(IDS_HISTORY_NEWEST)));
+  localized_strings.SetString(ASCIIToUTF16("newer"),
+      WideToUTF16Hack(l10n_util::GetString(IDS_HISTORY_NEWER)));
+  localized_strings.SetString(ASCIIToUTF16("older"),
+      WideToUTF16Hack(l10n_util::GetString(IDS_HISTORY_OLDER)));
+  localized_strings.SetString(ASCIIToUTF16("searchresultsfor"),
+      WideToUTF16Hack(l10n_util::GetString(IDS_HISTORY_SEARCHRESULTSFOR)));
+  localized_strings.SetString(ASCIIToUTF16("history"),
+      WideToUTF16Hack(l10n_util::GetString(IDS_HISTORY_BROWSERESULTS)));
+  localized_strings.SetString(ASCIIToUTF16("cont"),
+      WideToUTF16Hack(l10n_util::GetString(IDS_HISTORY_CONTINUED)));
+  localized_strings.SetString(ASCIIToUTF16("searchbutton"),
+      WideToUTF16Hack(l10n_util::GetString(IDS_HISTORY_SEARCH_BUTTON)));
+  localized_strings.SetString(ASCIIToUTF16("noresults"),
+      WideToUTF16Hack(l10n_util::GetString(IDS_HISTORY_NO_RESULTS)));
+  localized_strings.SetString(ASCIIToUTF16("noitems"),
+      WideToUTF16Hack(l10n_util::GetString(IDS_HISTORY_NO_ITEMS)));
+  localized_strings.SetString(ASCIIToUTF16("deleteday"),
+      WideToUTF16Hack(
+          l10n_util::GetString(IDS_HISTORY_DELETE_PRIOR_VISITS_LINK)));
+  localized_strings.SetString(ASCIIToUTF16("deletedaywarning"),
+      WideToUTF16Hack(
+          l10n_util::GetString(IDS_HISTORY_DELETE_PRIOR_VISITS_WARNING)));
 
   static const StringPiece history_html(
       ResourceBundle::GetSharedInstance().GetRawDataResource(
           IDR_HISTORY_HTML));
   const std::string full_html = jstemplate_builder::GetTemplateHtml(
       history_html, &localized_strings, "t");
 
   scoped_refptr<RefCountedBytes> html_bytes(new RefCountedBytes);
   html_bytes->data.resize(full_html.size());
   std::copy(full_html.begin(), full_html.end(), html_bytes->data.begin());
@@ skipping 131 matching lines @@
 
   ListValue results_value;
   Time midnight_today = 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(ASCIIToUTF16("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(ASCIIToUTF16("dateRelativeDay"),
+                            WideToUTF16Hack(date_str));
+      page_value->SetString(
+          ASCIIToUTF16("dateTimeOfDay"),
+          WideToUTF16Hack(base::TimeFormatTimeOfDay(page.visit_time())));
     } else {
-      page_value->SetString(L"dateShort",
-          base::TimeFormatShortDate(page.visit_time()));
-      page_value->SetString(L"snippet", page.snippet().text());
+      page_value->SetString(
+          ASCIIToUTF16("dateShort"),
+          WideToUTF16Hack(base::TimeFormatShortDate(page.visit_time())));
+      page_value->SetString(
+          ASCIIToUTF16("snippet"), WideToUTF16Hack(page.snippet().text()));
     }
-    page_value->SetBoolean(L"starred", 
+    page_value->SetBoolean(ASCIIToUTF16("starred"),
         dom_ui_->get_profile()->GetBookmarkModel()->IsBookmarked(page.url()));
     results_value.Append(page_value);
   }
 
   StringValue temp(search_text_);
   dom_ui_->CallJavascriptFunction(L"historyResult", temp, results_value);
 }
 
 void BrowsingHistoryHandler::ExtractSearchHistoryArguments(const Value* value,
     int* month, std::wstring* query) {
@@ skipping 106 matching lines @@
   url += kHistoryHost;
   return GURL(url);
 }
 
 // static
 const GURL HistoryUI::GetHistoryURLWithSearchText(
   const std::wstring& text) {
     return GURL(GetBaseURL().spec() + "#q=" +
       EscapeQueryParamValue(WideToUTF8(text)));
 }