summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chrome/browser/chromeos/dom_ui/menu_ui.cc2
-rw-r--r--chrome/browser/ui/views/fullscreen_exit_bubble.cc3
-rw-r--r--chrome/browser/ui/views/wrench_menu.cc15
-rw-r--r--views/accelerator.cc4
-rw-r--r--views/accelerator.h3
-rw-r--r--views/controls/menu/menu_item_view.cc29
-rw-r--r--views/controls/menu/menu_item_view.h6
7 files changed, 32 insertions, 30 deletions
diff --git a/chrome/browser/chromeos/dom_ui/menu_ui.cc b/chrome/browser/chromeos/dom_ui/menu_ui.cc
index 1bbc2b4..65536d9 100644
--- a/chrome/browser/chromeos/dom_ui/menu_ui.cc
+++ b/chrome/browser/chromeos/dom_ui/menu_ui.cc
@@ -627,7 +627,7 @@ DictionaryValue* MenuUI::CreateMenuItem(const menus::MenuModel* model,
}
views::Accelerator menu_accelerator;
if (model->GetAcceleratorAt(index, &menu_accelerator)) {
- item->SetString("accel", WideToUTF16(menu_accelerator.GetShortcutText()));
+ item->SetString("accel", menu_accelerator.GetShortcutText());
*has_accel = true;
}
return item;
diff --git a/chrome/browser/ui/views/fullscreen_exit_bubble.cc b/chrome/browser/ui/views/fullscreen_exit_bubble.cc
index e94ed66..6a5b421 100644
--- a/chrome/browser/ui/views/fullscreen_exit_bubble.cc
+++ b/chrome/browser/ui/views/fullscreen_exit_bubble.cc
@@ -150,7 +150,8 @@ FullscreenExitBubble::FullscreenExitBubble(
views::Accelerator accelerator(app::VKEY_UNKNOWN, false, false, false);
bool got_accelerator = frame->GetAccelerator(IDC_FULLSCREEN, &accelerator);
DCHECK(got_accelerator);
- view_ = new FullscreenExitView(this, accelerator.GetShortcutText());
+ view_ = new FullscreenExitView(
+ this, UTF16ToWideHack(accelerator.GetShortcutText()));
// Initialize the popup.
#if defined(OS_WIN)
diff --git a/chrome/browser/ui/views/wrench_menu.cc b/chrome/browser/ui/views/wrench_menu.cc
index bc10859..88f8ee3 100644
--- a/chrome/browser/ui/views/wrench_menu.cc
+++ b/chrome/browser/ui/views/wrench_menu.cc
@@ -244,11 +244,10 @@ class ScheduleAllView : public views::View {
DISALLOW_COPY_AND_ASSIGN(ScheduleAllView);
};
-std::wstring GetAccessibleNameForWrenchMenuItem(
+string16 GetAccessibleNameForWrenchMenuItem(
MenuModel* model, int item_index, int accessible_string_id) {
- std::wstring accessible_name =
- UTF16ToWide(l10n_util::GetStringUTF16(accessible_string_id));
- std::wstring accelerator_text;
+ string16 accessible_name = l10n_util::GetStringUTF16(accessible_string_id);
+ string16 accelerator_text;
menus::Accelerator menu_accelerator;
if (model->GetAcceleratorAt(item_index, &menu_accelerator)) {
@@ -282,8 +281,8 @@ class WrenchMenuView : public ScheduleAllView, public views::ButtonListener {
int acc_string_id) {
TextButton* button =
new TextButton(this, UTF16ToWide(l10n_util::GetStringUTF16(string_id)));
- button->SetAccessibleName(
- GetAccessibleNameForWrenchMenuItem(menu_model_, index, acc_string_id));
+ button->SetAccessibleName(UTF16ToWide(
+ GetAccessibleNameForWrenchMenuItem(menu_model_, index, acc_string_id)));
button->SetFocusable(true);
button->set_request_focus_on_press(false);
button->set_tag(index);
@@ -430,9 +429,9 @@ class WrenchMenu::ZoomView : public WrenchMenuView,
0, kHorizontalPadding, 0, kHorizontalPadding));
fullscreen_button_->set_background(
new MenuButtonBackground(MenuButtonBackground::SINGLE_BUTTON));
- fullscreen_button_->SetAccessibleName(
+ fullscreen_button_->SetAccessibleName(UTF16ToWide(
GetAccessibleNameForWrenchMenuItem(
- menu_model, fullscreen_index, IDS_ACCNAME_FULLSCREEN));
+ menu_model, fullscreen_index, IDS_ACCNAME_FULLSCREEN)));
AddChildView(fullscreen_button_);
UpdateZoomControls();
diff --git a/views/accelerator.cc b/views/accelerator.cc
index 9cf6884..de1e131 100644
--- a/views/accelerator.cc
+++ b/views/accelerator.cc
@@ -19,7 +19,7 @@
namespace views {
-std::wstring Accelerator::GetShortcutText() const {
+string16 Accelerator::GetShortcutText() const {
int string_id = 0;
switch(key_code_) {
case app::VKEY_TAB:
@@ -157,7 +157,7 @@ std::wstring Accelerator::GetShortcutText() const {
shortcut.swap(shortcut_rtl);
}
- return UTF16ToWide(shortcut);
+ return shortcut;
}
} // namespace views
diff --git a/views/accelerator.h b/views/accelerator.h
index 5cf68f1..05fa83b 100644
--- a/views/accelerator.h
+++ b/views/accelerator.h
@@ -15,6 +15,7 @@
#include <string>
#include "app/menus/accelerator.h"
+#include "base/string16.h"
#include "views/event.h"
namespace views {
@@ -53,7 +54,7 @@ class Accelerator : public menus::Accelerator {
}
// Returns a string with the localized shortcut if any.
- std::wstring GetShortcutText() const;
+ string16 GetShortcutText() const;
};
// An interface that classes that want to register for keyboard accelerators
diff --git a/views/controls/menu/menu_item_view.cc b/views/controls/menu/menu_item_view.cc
index 4086018..e2359d7 100644
--- a/views/controls/menu/menu_item_view.cc
+++ b/views/controls/menu/menu_item_view.cc
@@ -126,13 +126,14 @@ AccessibilityTypes::State MenuItemView::GetAccessibleState() {
}
// static
-std::wstring MenuItemView::GetAccessibleNameForMenuItem(
- const std::wstring& item_text, const std::wstring& accelerator_text) {
- std::wstring accessible_name = item_text;
+string16 MenuItemView::GetAccessibleNameForMenuItem(
+ const string16& item_text, const string16& accelerator_text) {
+ string16 accessible_name = item_text;
// Filter out the "&" for accessibility clients.
size_t index = 0;
- while ((index = accessible_name.find(L"&", index)) != std::wstring::npos &&
+ const char16 amp = '&';
+ while ((index = accessible_name.find(amp, index)) != string16::npos &&
index + 1 < accessible_name.length()) {
accessible_name.replace(index, accessible_name.length() - index,
accessible_name.substr(index + 1));
@@ -143,9 +144,8 @@ std::wstring MenuItemView::GetAccessibleNameForMenuItem(
}
// Append accelerator text.
- menus::Accelerator menu_accelerator;
if (!accelerator_text.empty()) {
- accessible_name.append(L" ");
+ accessible_name.push_back(' ');
accessible_name.append(accelerator_text);
}
@@ -306,7 +306,8 @@ SubmenuView* MenuItemView::CreateSubmenu() {
void MenuItemView::SetTitle(const std::wstring& title) {
title_ = WideToUTF16Hack(title);
- SetAccessibleName(GetAccessibleNameForMenuItem(title, GetAcceleratorText()));
+ SetAccessibleName(UTF16ToWideHack(
+ GetAccessibleNameForMenuItem(title_, GetAcceleratorText())));
}
void MenuItemView::SetSelected(bool selected) {
@@ -429,7 +430,7 @@ void MenuItemView::Layout() {
}
int MenuItemView::GetAcceleratorTextWidth() {
- string16 text = WideToUTF16Hack(GetAcceleratorText());
+ string16 text = GetAcceleratorText();
return text.empty() ? 0 : MenuConfig::instance().font.GetStringWidth(text);
}
@@ -593,7 +594,7 @@ void MenuItemView::AdjustBoundsForRTLUI(gfx::Rect* rect) const {
}
void MenuItemView::PaintAccelerator(gfx::Canvas* canvas) {
- std::wstring accel_text = GetAcceleratorText();
+ string16 accel_text = GetAcceleratorText();
if (accel_text.empty())
return;
@@ -612,9 +613,9 @@ void MenuItemView::PaintAccelerator(gfx::Canvas* canvas) {
else
flags |= gfx::Canvas::TEXT_ALIGN_RIGHT;
canvas->DrawStringInt(
- accel_text, font, TextButton::kDisabledColor, accel_bounds.x(),
- accel_bounds.y(), accel_bounds.width(), accel_bounds.height(),
- flags);
+ UTF16ToWideHack(accel_text), font, TextButton::kDisabledColor,
+ accel_bounds.x(), accel_bounds.y(), accel_bounds.width(),
+ accel_bounds.height(), flags);
}
void MenuItemView::DestroyAllMenuHosts() {
@@ -656,11 +657,11 @@ int MenuItemView::GetChildPreferredWidth() {
return width;
}
-std::wstring MenuItemView::GetAcceleratorText() {
+string16 MenuItemView::GetAcceleratorText() {
Accelerator accelerator;
return (GetDelegate() &&
GetDelegate()->GetAccelerator(GetCommand(), &accelerator)) ?
- accelerator.GetShortcutText() : std::wstring();
+ accelerator.GetShortcutText() : string16();
}
} // namespace views
diff --git a/views/controls/menu/menu_item_view.h b/views/controls/menu/menu_item_view.h
index 86347f9..83e5102 100644
--- a/views/controls/menu/menu_item_view.h
+++ b/views/controls/menu/menu_item_view.h
@@ -106,8 +106,8 @@ class MenuItemView : public View {
// Returns the accessible name to be used with screen readers. Mnemonics are
// removed and the menu item accelerator text is appended.
- static std::wstring GetAccessibleNameForMenuItem(
- const std::wstring& item_text, const std::wstring& accelerator_text);
+ static string16 GetAccessibleNameForMenuItem(
+ const string16& item_text, const string16& accelerator_text);
// Run methods. See description above class for details. Both Run methods take
// a rectangle, which is used to position the menu. |has_mnemonics| indicates
@@ -348,7 +348,7 @@ class MenuItemView : public View {
void DestroyAllMenuHosts();
// Returns the accelerator text.
- std::wstring GetAcceleratorText();
+ string16 GetAcceleratorText();
// Returns the various margins.
int GetTopMargin();
generated by cgit v1.1 at 2025-02-10 06:44:50 +0000