diff options
| -rw-r--r-- | ui/base/accelerators/accelerator.cc | 14 | ||||
| -rw-r--r-- | ui/base/accelerators/accelerator.h | 2 | ||||
| -rw-r--r-- | ui/base/accelerators/accelerator_manager_unittest.cc | 4 |
3 files changed, 11 insertions, 9 deletions
diff --git a/ui/base/accelerators/accelerator.cc b/ui/base/accelerators/accelerator.cc index d5d9391..fbb60a7 100644 --- a/ui/base/accelerators/accelerator.cc +++ b/ui/base/accelerators/accelerator.cc @@ -98,9 +98,9 @@ bool Accelerator::IsCmdDown() const { return (modifiers_ & EF_COMMAND_DOWN) != 0; } -string16 Accelerator::GetShortcutText() const { +base::string16 Accelerator::GetShortcutText() const { int string_id = 0; - switch(key_code_) { + switch (key_code_) { case ui::VKEY_TAB: string_id = IDS_APP_TAB_KEY; break; @@ -159,7 +159,7 @@ string16 Accelerator::GetShortcutText() const { break; } - string16 shortcut; + base::string16 shortcut; if (!string_id) { #if defined(OS_WIN) // Our fallback is to try translate the key code to a regular character @@ -177,7 +177,8 @@ string16 Accelerator::GetShortcutText() const { #elif defined(USE_AURA) || defined(OS_MACOSX) const uint16 c = GetCharacterFromKeyCode(key_code_, false); if (c != 0) - shortcut += static_cast<string16::value_type>(base::ToUpperASCII(c)); + shortcut += + static_cast<base::string16::value_type>(base::ToUpperASCII(c)); #elif defined(TOOLKIT_GTK) const gchar* name = NULL; switch (key_code_) { @@ -190,7 +191,8 @@ string16 Accelerator::GetShortcutText() const { } if (name) { if (name[0] != 0 && name[1] == 0) - shortcut += static_cast<string16::value_type>(g_ascii_toupper(name[0])); + shortcut += + static_cast<base::string16::value_type>(g_ascii_toupper(name[0])); else shortcut += UTF8ToUTF16(name); } @@ -203,7 +205,7 @@ string16 Accelerator::GetShortcutText() const { // If it is not, then we need to adjust the string later on if the locale is // right-to-left. See below for more information of why such adjustment is // required. - string16 shortcut_rtl; + base::string16 shortcut_rtl; bool adjust_shortcut_for_rtl = false; if (base::i18n::IsRTL() && shortcut.length() == 1 && !IsAsciiAlpha(shortcut[0]) && !IsAsciiDigit(shortcut[0])) { diff --git a/ui/base/accelerators/accelerator.h b/ui/base/accelerators/accelerator.h index c33cd87..e86538c 100644 --- a/ui/base/accelerators/accelerator.h +++ b/ui/base/accelerators/accelerator.h @@ -56,7 +56,7 @@ class UI_EXPORT Accelerator { bool IsCmdDown() const; // Returns a string with the localized shortcut if any. - string16 GetShortcutText() const; + base::string16 GetShortcutText() const; void set_platform_accelerator(scoped_ptr<PlatformAccelerator> p) { platform_accelerator_ = p.Pass(); diff --git a/ui/base/accelerators/accelerator_manager_unittest.cc b/ui/base/accelerators/accelerator_manager_unittest.cc index 69bfc46..73d1a1d 100644 --- a/ui/base/accelerators/accelerator_manager_unittest.cc +++ b/ui/base/accelerators/accelerator_manager_unittest.cc @@ -139,7 +139,7 @@ TEST_F(AcceleratorManagerTest, Process) { // Test all 2*2*2 cases (shift/control/alt = on/off). for (int mask = 0; mask < 2 * 2 * 2; ++mask) { Accelerator accelerator(GetAccelerator(VKEY_A, mask)); - const string16 text = accelerator.GetShortcutText(); + const base::string16 text = accelerator.GetShortcutText(); manager_.Register(accelerator, AcceleratorManager::kNormalPriority, &target); @@ -169,7 +169,7 @@ TEST_F(AcceleratorManagerTest, Process) { if (test_mask == mask) continue; const Accelerator test_accelerator(GetAccelerator(VKEY_A, test_mask)); - const string16 test_text = test_accelerator.GetShortcutText(); + const base::string16 test_text = test_accelerator.GetShortcutText(); EXPECT_FALSE(manager_.Process(test_accelerator)) << text << ", " << test_text; // different modifiers } |