Port DictionaryValue to use string16 instead of wstring.

chrome/browser/dom_ui/new_tab_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 "build/build_config.h"
 
 #include "chrome/browser/dom_ui/new_tab_ui.h"
 
 #include "base/histogram.h"
 #include "base/string_piece.h"
@@ skipping 107 matching lines @@
   ScopedRunnableMethodFactory<PaintTimer> method_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PaintTimer);
 };
 
 // Adds "url", "title", and "direction" keys on incoming dictionary, setting
 // title as the url as a fallback on empty title.
 void SetURLTitleAndDirection(DictionaryValue* dictionary,
                              const std::wstring& title,
                              const GURL& gurl) {
-  std::wstring wstring_url = UTF8ToWide(gurl.spec());
-  dictionary->SetString(L"url", wstring_url);
+  string16 string_url = UTF8ToUTF16(gurl.spec());
+  dictionary->SetString(ASCIIToUTF16("url"), string_url);
 
   bool using_url_as_the_title = false;
   std::wstring title_to_set(title);
   if (title_to_set.empty()) {
     using_url_as_the_title = true;
-    title_to_set = wstring_url;
+    title_to_set = UTF16ToWideHack(string_url);
   }
 
   // We set the "dir" attribute of the title, so that in RTL locales, a LTR
   // title is rendered left-to-right and truncated from the right. For example,
   // the title of http://msdn.microsoft.com/en-us/default.aspx is "MSDN:
   // Microsoft developer network". In RTL locales, in the [New Tab] page, if
   // the "dir" of this title is not specified, it takes Chrome UI's
   // directionality. So the title will be truncated as "soft developer
   // network". Setting the "dir" attribute as "ltr" renders the truncated title
   // as "MSDN: Microsoft D...". As another example, the title of
@@ skipping 15 matching lines @@
       l10n_util::WrapStringWithLTRFormatting(&title_to_set);
     } else {
       if (l10n_util::StringContainsStrongRTLChars(title)) {
         l10n_util::WrapStringWithRTLFormatting(&title_to_set);
         direction = kRTLHtmlTextDirection;
       } else {
         l10n_util::WrapStringWithLTRFormatting(&title_to_set);
       }
     }
   }
-  dictionary->SetString(L"title", title_to_set);
-  dictionary->SetString(L"direction", direction);
+  dictionary->SetString(ASCIIToUTF16("title"), WideToUTF16Hack(title_to_set));
+  dictionary->SetString(ASCIIToUTF16("direction"), WideToUTF16Hack(direction));
 }
 
 }  // end anonymous namespace
 
 ///////////////////////////////////////////////////////////////////////////////
 // NewTabHTMLSource
 
 NewTabHTMLSource::NewTabHTMLSource()
     : DataSource(kNewTabHost, MessageLoop::current()) {
 }
@@ skipping 18 matching lines @@
     // Get the current profile name.
     std::wstring profile_name =
       UserDataManager::Get()->current_profile_name();
     title = l10n_util::GetStringF(IDS_NEW_TAB_TITLE_WITH_PROFILE_NAME,
                                   profile_name);
     most_visited = l10n_util::GetStringF(
         IDS_NEW_TAB_MOST_VISITED_WITH_PROFILE_NAME,
         profile_name);
   }
   DictionaryValue localized_strings;
-  localized_strings.SetString(L"title", title);
-  localized_strings.SetString(L"mostvisited", most_visited);
-  localized_strings.SetString(L"searches",
-      l10n_util::GetString(IDS_NEW_TAB_SEARCHES));
-  localized_strings.SetString(L"bookmarks",
-      l10n_util::GetString(IDS_NEW_TAB_BOOKMARKS));
-  localized_strings.SetString(L"showhistory",
-      l10n_util::GetString(IDS_NEW_TAB_HISTORY_SHOW));
-  localized_strings.SetString(L"searchhistory",
-      l10n_util::GetString(IDS_NEW_TAB_HISTORY_SEARCH));
-  localized_strings.SetString(L"recentlyclosed",
-      l10n_util::GetString(IDS_NEW_TAB_RECENTLY_CLOSED));
-  localized_strings.SetString(L"mostvisitedintro",
-      l10n_util::GetStringF(IDS_NEW_TAB_MOST_VISITED_INTRO,
-          l10n_util::GetString(IDS_WELCOME_PAGE_URL)));
-  localized_strings.SetString(L"closedwindow",
-      l10n_util::GetString(IDS_NEW_TAB_RECENTLY_CLOSED_WINDOW));
+  localized_strings.SetString(ASCIIToUTF16("title"), WideToUTF16Hack(title));
+  localized_strings.SetString(ASCIIToUTF16("mostvisited"),
+                              WideToUTF16Hack(most_visited));
+  localized_strings.SetString(ASCIIToUTF16("searches"),
+      WideToUTF16Hack(l10n_util::GetString(IDS_NEW_TAB_SEARCHES)));
+  localized_strings.SetString(ASCIIToUTF16("bookmarks"),
+      WideToUTF16Hack(l10n_util::GetString(IDS_NEW_TAB_BOOKMARKS)));
+  localized_strings.SetString(ASCIIToUTF16("showhistory"),
+      WideToUTF16Hack(l10n_util::GetString(IDS_NEW_TAB_HISTORY_SHOW)));
+  localized_strings.SetString(ASCIIToUTF16("searchhistory"),
+      WideToUTF16Hack(l10n_util::GetString(IDS_NEW_TAB_HISTORY_SEARCH)));
+  localized_strings.SetString(ASCIIToUTF16("recentlyclosed"),
+      WideToUTF16Hack(l10n_util::GetString(IDS_NEW_TAB_RECENTLY_CLOSED)));
+  localized_strings.SetString(
+      ASCIIToUTF16("mostvisitedintro"),
+      WideToUTF16Hack(l10n_util::GetStringF(
+                          IDS_NEW_TAB_MOST_VISITED_INTRO,
+                          l10n_util::GetString(IDS_WELCOME_PAGE_URL))));
+  localized_strings.SetString(
+      ASCIIToUTF16("closedwindow"),
+      WideToUTF16Hack(
+          l10n_util::GetString(IDS_NEW_TAB_RECENTLY_CLOSED_WINDOW)));
 
-  localized_strings.SetString(L"textdirection",
-      (l10n_util::GetTextDirection() == l10n_util::RIGHT_TO_LEFT) ?
-       kRTLHtmlTextDirection : kDefaultHtmlTextDirection);
+  localized_strings.SetString(
+      ASCIIToUTF16("textdirection"),
+      WideToUTF16Hack(
+          (l10n_util::GetTextDirection() == l10n_util::RIGHT_TO_LEFT) ?
+          kRTLHtmlTextDirection : kDefaultHtmlTextDirection));
 
   // Let the tab know whether it's the first tab being viewed.
-  localized_strings.SetString(L"firstview",
-                              first_view_ ? L"true" : std::wstring());
+  localized_strings.SetString(ASCIIToUTF16("firstview"),
+                              first_view_ ? ASCIIToUTF16("true") : string16());
   first_view_ = false;
 
 #ifdef CHROME_PERSONALIZATION
-  localized_strings.SetString(L"p13nsrc", Personalization::GetNewTabSource());
+  localized_strings.SetString(ASCIIToUTF16("p13nsrc"),
+                              Personalization::GetNewTabSource());
 #endif
 
   static const StringPiece new_tab_html(
       ResourceBundle::GetSharedInstance().GetRawDataResource(
           IDR_NEW_TAB_HTML));
 
   const std::string full_html = jstemplate_builder::GetTemplateHtml(
       new_tab_html, &localized_strings, "t" /* template root node id */);
 
   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());
 
   SendResponse(request_id, html_bytes);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // IncognitoTabHTMLSource
 
 IncognitoTabHTMLSource::IncognitoTabHTMLSource()
     : DataSource("new-tab", MessageLoop::current()) {
 }
 
 void IncognitoTabHTMLSource::StartDataRequest(const std::string& path,
                                               int request_id) {
   DictionaryValue localized_strings;
-  localized_strings.SetString(L"title",
-      l10n_util::GetString(IDS_NEW_TAB_TITLE));
-  localized_strings.SetString(L"content",
-      l10n_util::GetStringF(IDS_NEW_TAB_OTR_MESSAGE,
-          l10n_util::GetString(IDS_LEARN_MORE_INCOGNITO_URL)));
+  localized_strings.SetString(ASCIIToUTF16("title"),
+      WideToUTF16Hack(l10n_util::GetString(IDS_NEW_TAB_TITLE)));
+  localized_strings.SetString(
+      ASCIIToUTF16("content"),
+      WideToUTF16Hack(l10n_util::GetStringF(
+                          IDS_NEW_TAB_OTR_MESSAGE,
+                          l10n_util::GetString(IDS_LEARN_MORE_INCOGNITO_URL))));
 
-  localized_strings.SetString(L"textdirection",
-      (l10n_util::GetTextDirection() == l10n_util::RIGHT_TO_LEFT) ?
-       kRTLHtmlTextDirection : kDefaultHtmlTextDirection);
+  localized_strings.SetString(
+      ASCIIToUTF16("textdirection"),
+      WideToUTF16Hack(
+          (l10n_util::GetTextDirection() == l10n_util::RIGHT_TO_LEFT) ?
+          kRTLHtmlTextDirection : kDefaultHtmlTextDirection));
 
   static const StringPiece incognito_tab_html(
       ResourceBundle::GetSharedInstance().GetRawDataResource(
           IDR_INCOGNITO_TAB_HTML));
 
   const std::string full_html = jstemplate_builder::GetTemplateHtml(
       incognito_tab_html, &localized_strings, "t" /* template root node id */);
 
   scoped_refptr<RefCountedBytes> html_bytes(new RefCountedBytes);
   html_bytes->data.resize(full_html.size());
@@ skipping 189 matching lines @@
   sort(urls.begin(), urls.end(), TemplateURLSortByUsage);
   ListValue urls_value;
   for (size_t i = 0; i < std::min<size_t>(urls.size(), kSearchURLs); ++i) {
     if (urls[i]->usage_count() == 0)
       break;  // urls is sorted by usage count; the remainder would be no good.
 
     const TemplateURLRef* urlref = urls[i]->url();
     if (!urlref)
       continue;
     DictionaryValue* entry_value = new DictionaryValue;
-    entry_value->SetString(L"short_name", urls[i]->short_name());
-    entry_value->SetString(L"keyword", urls[i]->keyword());
+    entry_value->SetString(ASCIIToUTF16("short_name"),
+                           WideToUTF16Hack(urls[i]->short_name()));
+    entry_value->SetString(ASCIIToUTF16("keyword"),
+                           WideToUTF16Hack(urls[i]->keyword()));
 
     const GURL& url = urls[i]->GetFavIconURL();
     if (url.is_valid())
-     entry_value->SetString(L"favIconURL", UTF8ToWide(url.spec()));
+     entry_value->SetString(ASCIIToUTF16("favIconURL"),
+                            UTF8ToUTF16(url.spec()));
 
     urls_value.Append(entry_value);
   }
   UMA_HISTOGRAM_COUNTS("NewTabPage.SearchURLs.Total", urls_value.GetSize());
   dom_ui_->CallJavascriptFunction(L"searchURLs", urls_value);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // RecentlyBookmarkedHandler
 
@@ skipping 138 matching lines @@
   // whose selected navigation is not the new tab ui.
   for (TabRestoreService::Entries::const_iterator it = entries.begin();
        it != entries.end() && added_count < 3; ++it) {
     TabRestoreService::Entry* entry = *it;
     DictionaryValue* value = new DictionaryValue();
     if ((entry->type == TabRestoreService::TAB &&
          TabToValue(*static_cast<TabRestoreService::Tab*>(entry), value)) ||
         (entry->type == TabRestoreService::WINDOW &&
          WindowToValue(*static_cast<TabRestoreService::Window*>(entry),
                        value))) {
-      value->SetInteger(L"sessionId", entry->id);
+      value->SetInteger(ASCIIToUTF16("sessionId"), entry->id);
       list_value.Append(value);
       added_count++;
     } else {
       delete value;
     }
   }
   dom_ui_->CallJavascriptFunction(L"recentlyClosedTabs", list_value);
 }
 
 void RecentlyClosedTabsHandler::TabRestoreServiceDestroyed(
     TabRestoreService* service) {
   tab_restore_service_ = NULL;
 }
 
 bool RecentlyClosedTabsHandler::TabToValue(
     const TabRestoreService::Tab& tab,
     DictionaryValue* dictionary) {
   if (tab.navigations.empty())
     return false;
 
   const TabNavigation& current_navigation =
       tab.navigations.at(tab.current_navigation_index);
   if (current_navigation.url() == NewTabUI::GetBaseURL())
     return false;
 
   SetURLTitleAndDirection(dictionary, current_navigation.title(),
                           current_navigation.url());
-  dictionary->SetString(L"type", L"tab");
+  dictionary->SetString(ASCIIToUTF16("type"), ASCIIToUTF16("tab"));
   return true;
 }
 
 bool RecentlyClosedTabsHandler::WindowToValue(
     const TabRestoreService::Window& window,
     DictionaryValue* dictionary) {
   if (window.tabs.empty()) {
     NOTREACHED();
     return false;
   }
 
   ListValue* tab_values = new ListValue();
   for (size_t i = 0; i < window.tabs.size(); ++i) {
     DictionaryValue* tab_value = new DictionaryValue();
     if (TabToValue(window.tabs[i], tab_value))
       tab_values->Append(tab_value);
     else
       delete tab_value;
   }
   if (tab_values->GetSize() == 0) {
     delete tab_values;
     return false;
   }
 
-  dictionary->SetString(L"type", L"window");
-  dictionary->Set(L"tabs", tab_values);
+  dictionary->SetString(ASCIIToUTF16("type"), ASCIIToUTF16("window"));
+  dictionary->Set(ASCIIToUTF16("tabs"), tab_values);
   return true;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // HistoryHandler
 
 HistoryHandler::HistoryHandler(DOMUI* dom_ui)
     : DOMMessageHandler(dom_ui),
       dom_ui_(dom_ui) {
   dom_ui->RegisterMessageCallback("showHistoryPage",
@@ skipping 165 matching lines @@
                               const GURL&,
                               WindowOpenDisposition disposition) {
   // The user opened a URL on the page (including "open in new window").
   // We count all such clicks as AUTO_BOOKMARK, which increments the site's
   // visit count (which is used for ranking the most visited entries).
   // Note this means we're including clicks on not only most visited
   // thumbnails, but also clicks on recently bookmarked.
   get_contents()->OpenURL(url, GURL(), disposition,
                           PageTransition::AUTO_BOOKMARK);
 }