diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-05-24 16:24:13 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-05-25 14:13:32 +0100 |
| commit | 3f50c38dc070f4bb515c1b64450dae14f316474e (patch) | |
| tree | 29f309f9534e05c47244eedb438fc612578d133b /chrome/browser/ui/views/clear_data_view.cc | |
| parent | e23bef148f7be2bdf9c3cb2cd3aa5ceebf1190fb (diff) | |
| download | external_chromium-3f50c38dc070f4bb515c1b64450dae14f316474e.zip external_chromium-3f50c38dc070f4bb515c1b64450dae14f316474e.tar.gz external_chromium-3f50c38dc070f4bb515c1b64450dae14f316474e.tar.bz2 | |
Merge Chromium at r10.0.634.0: Initial merge by git.
Change-Id: Iac2af492818d119bcc2562eb5fdabf5ab0b6df9c
Diffstat (limited to 'chrome/browser/ui/views/clear_data_view.cc')
| -rw-r--r-- | chrome/browser/ui/views/clear_data_view.cc | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/chrome/browser/ui/views/clear_data_view.cc b/chrome/browser/ui/views/clear_data_view.cc index 9703277..839d668 100644 --- a/chrome/browser/ui/views/clear_data_view.cc +++ b/chrome/browser/ui/views/clear_data_view.cc @@ -53,19 +53,22 @@ ClearDataView::ClearDataView(Profile* profile) void ClearDataView::Init() { tabs_ = new views::TabbedPane; - tabs_->SetAccessibleName(l10n_util::GetStringF(IDS_OPTIONS_DIALOG_TITLE, - l10n_util::GetString(IDS_OPTIONS_DIALOG_TITLE))); + tabs_->SetAccessibleName( + UTF16ToWide(l10n_util::GetStringFUTF16(IDS_OPTIONS_DIALOG_TITLE, + l10n_util::GetStringUTF16(IDS_OPTIONS_DIALOG_TITLE)))); AddChildView(tabs_); int tab_index = 0; clear_browsing_data_tab_ = new ClearBrowsingDataView2(profile_, this); - tabs_->AddTabAtIndex(tab_index++, - l10n_util::GetString(IDS_CLEAR_CHROME_DATA_TAB_LABEL), - clear_browsing_data_tab_, false); + tabs_->AddTabAtIndex( + tab_index++, + UTF16ToWide(l10n_util::GetStringUTF16(IDS_CLEAR_CHROME_DATA_TAB_LABEL)), + clear_browsing_data_tab_, false); clear_server_data_tab_ = new ClearServerDataView(profile_, this); - tabs_->AddTabAtIndex(tab_index++, - l10n_util::GetString(IDS_CLEAR_OTHER_DATA_TAB_LABEL), - clear_server_data_tab_, false); + tabs_->AddTabAtIndex( + tab_index++, + UTF16ToWide(l10n_util::GetStringUTF16(IDS_CLEAR_OTHER_DATA_TAB_LABEL)), + clear_server_data_tab_, false); tabs_->SelectTabAt(static_cast<int>(0)); } @@ -126,7 +129,7 @@ int ClearDataView::GetDefaultDialogButton() const { std::wstring ClearDataView::GetDialogButtonLabel( MessageBoxFlags::DialogButton button) const { DCHECK(button == MessageBoxFlags::DIALOGBUTTON_CANCEL); - return l10n_util::GetString(IDS_CANCEL); + return UTF16ToWide(l10n_util::GetStringUTF16(IDS_CANCEL)); } int ClearDataView::GetDialogButtons() const { @@ -161,7 +164,7 @@ bool ClearDataView::IsModal() const { } std::wstring ClearDataView::GetWindowTitle() const { - return l10n_util::GetString(IDS_CLEAR_BROWSING_DATA_TITLE); + return UTF16ToWide(l10n_util::GetStringUTF16(IDS_CLEAR_BROWSING_DATA_TITLE)); } views::View* ClearDataView::GetContentsView() { |