diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-05 22:48:13 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-05 22:48:13 +0000 |
| commit | 833005a107c6997c106aa545a2257a52dfecadfb (patch) | |
| tree | d98408775b4a84d6796c61894719ff6d53625514 /chrome/browser | |
| parent | a5a48a1835ea033e49805e4dc57495ee7231a029 (diff) | |
| download | chromium_src-833005a107c6997c106aa545a2257a52dfecadfb.zip chromium_src-833005a107c6997c106aa545a2257a52dfecadfb.tar.gz chromium_src-833005a107c6997c106aa545a2257a52dfecadfb.tar.bz2 | |
Remove last usage of wstring from Linux build, fix official builders.
BUG=9911
TEST=Official Linux builders build
Review URL: http://codereview.chromium.org/6065015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70547 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/gtk/about_chrome_dialog.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/gtk/about_chrome_dialog.cc b/chrome/browser/gtk/about_chrome_dialog.cc index ae682b9..3d1ffa9 100644 --- a/chrome/browser/gtk/about_chrome_dialog.cc +++ b/chrome/browser/gtk/about_chrome_dialog.cc @@ -255,18 +255,18 @@ void ShowAboutDialogForProfile(GtkWindow* parent, Profile* profile) { gtk_box_pack_start(GTK_BOX(vbox), gtk_label_new(""), FALSE, FALSE, 0); std::vector<size_t> url_offsets; - std::wstring text = l10n_util::GetStringF(IDS_ABOUT_TERMS_OF_SERVICE, - std::wstring(), - std::wstring(), - &url_offsets); + string16 text = l10n_util::GetStringFUTF16(IDS_ABOUT_TERMS_OF_SERVICE, + string16(), + string16(), + &url_offsets); GtkWidget* tos_chunk1 = gtk_label_new( - WideToUTF8(text.substr(0, url_offsets[0])).c_str()); + UTF16ToUTF8(text.substr(0, url_offsets[0])).c_str()); gtk_misc_set_alignment(GTK_MISC(tos_chunk1), 0.0, 0.5); GtkWidget* tos_link = gtk_chrome_link_button_new( l10n_util::GetStringUTF8(IDS_TERMS_OF_SERVICE).c_str()); GtkWidget* tos_chunk2 = gtk_label_new( - WideToUTF8(text.substr(url_offsets[0])).c_str()); + UTF16ToUTF8(text.substr(url_offsets[0])).c_str()); gtk_misc_set_alignment(GTK_MISC(tos_chunk2), 0.0, 0.5); GtkWidget* tos_hbox = gtk_hbox_new(FALSE, 0); |