Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1083)

Unified Diff: chrome/browser/ui/views/wrench_menu.cc

Issue 6192007: Remove wstring from views. Part 3: Switch accessibility strings to string16.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/views/toolbar_view.cc ('k') | views/accessibility/view_accessibility.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/wrench_menu.cc
===================================================================
--- chrome/browser/ui/views/wrench_menu.cc (revision 71358)
+++ chrome/browser/ui/views/wrench_menu.cc (working copy)
@@ -282,8 +282,8 @@
int acc_string_id) {
TextButton* button =
new TextButton(this, UTF16ToWide(l10n_util::GetStringUTF16(string_id)));
- button->SetAccessibleName(UTF16ToWide(
- GetAccessibleNameForWrenchMenuItem(menu_model_, index, acc_string_id)));
+ button->SetAccessibleName(
+ GetAccessibleNameForWrenchMenuItem(menu_model_, index, acc_string_id));
button->SetFocusable(true);
button->set_request_focus_on_press(false);
button->set_tag(index);
@@ -430,9 +430,9 @@
0, kHorizontalPadding, 0, kHorizontalPadding));
fullscreen_button_->set_background(
new MenuButtonBackground(MenuButtonBackground::SINGLE_BUTTON));
- fullscreen_button_->SetAccessibleName(UTF16ToWide(
+ fullscreen_button_->SetAccessibleName(
GetAccessibleNameForWrenchMenuItem(
- menu_model, fullscreen_index, IDS_ACCNAME_FULLSCREEN)));
+ menu_model, fullscreen_index, IDS_ACCNAME_FULLSCREEN));
AddChildView(fullscreen_button_);
UpdateZoomControls();
@@ -572,8 +572,7 @@
void WrenchMenu::Init(menus::MenuModel* model) {
DCHECK(!root_.get());
root_.reset(new MenuItemView(this));
- root_->SetAccessibleName(
- UTF16ToWide(l10n_util::GetStringUTF16(IDS_ACCNAME_APP)));
+ root_->SetAccessibleName(l10n_util::GetStringUTF16(IDS_ACCNAME_APP));
root_->set_has_icons(true); // We have checks, radios and icons, set this
// so we get the taller menu style.
int next_id = 1;
« no previous file with comments | « chrome/browser/ui/views/toolbar_view.cc ('k') | views/accessibility/view_accessibility.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698