diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-02 16:21:17 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-02 16:21:17 +0000 |
| commit | a5176dafb70d5ea7567b18917d85c4cddc937dc4 (patch) | |
| tree | 45a3a875cb48ee3b54a536ba9a4a7a5902138650 /chrome/browser/views/toolbar_view.cc | |
| parent | 8e12ae06a009107635e2045db802907fd4ae2df1 (diff) | |
| download | chromium_src-a5176dafb70d5ea7567b18917d85c4cddc937dc4.zip chromium_src-a5176dafb70d5ea7567b18917d85c4cddc937dc4.tar.gz chromium_src-a5176dafb70d5ea7567b18917d85c4cddc937dc4.tar.bz2 | |
Convert menu strings to UTF16, fix some views-GTK build errors.
Review URL: http://codereview.chromium.org/150171
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19820 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/toolbar_view.cc')
| -rw-r--r-- | chrome/browser/views/toolbar_view.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/chrome/browser/views/toolbar_view.cc b/chrome/browser/views/toolbar_view.cc index 430da1c..d92a876 100644 --- a/chrome/browser/views/toolbar_view.cc +++ b/chrome/browser/views/toolbar_view.cc @@ -106,12 +106,12 @@ void EncodingMenuModel::Build() { AddSeparator(); } else { if (id == IDC_ENCODING_AUTO_DETECT) { - AddCheckItem(id, label); + AddCheckItem(id, WideToUTF16Hack(label)); } else { // Use the id of the first radio command as the id of the group. if (group_id <= 0) group_id = id; - AddRadioItem(id, label, group_id); + AddRadioItem(id, WideToUTF16Hack(label), group_id); } } } @@ -290,7 +290,7 @@ void ToolbarView::OnGetProfilesDone( for (int i = IDC_NEW_WINDOW_PROFILE_0; (i <= IDC_NEW_WINDOW_PROFILE_LAST) && (iter != profiles.end()); ++i, ++iter) - profiles_menu_contents_->AddItem(i, *iter); + profiles_menu_contents_->AddItem(i, WideToUTF16Hack(*iter)); // If there are more profiles then show "Other" link. if (iter != profiles.end()) { @@ -1087,13 +1087,13 @@ void ToolbarView::CreateAppMenu() { IDS_IMPORT_SETTINGS); app_menu_contents_->AddSeparator(); app_menu_contents_->AddItem(IDC_OPTIONS, - l10n_util::GetStringF( + l10n_util::GetStringFUTF16( IDS_OPTIONS, - l10n_util::GetString(IDS_PRODUCT_NAME))); + l10n_util::GetStringUTF16(IDS_PRODUCT_NAME))); app_menu_contents_->AddItem(IDC_ABOUT, - l10n_util::GetStringF( + l10n_util::GetStringFUTF16( IDS_ABOUT, - l10n_util::GetString(IDS_PRODUCT_NAME))); + l10n_util::GetStringUTF16(IDS_PRODUCT_NAME))); app_menu_contents_->AddItemWithStringId(IDC_HELP_PAGE, IDS_HELP_PAGE); app_menu_contents_->AddSeparator(); app_menu_contents_->AddItemWithStringId(IDC_EXIT, IDS_EXIT); |