ui/base/accelerators/accelerator.cc - Issue 1100763002: Inject CanAddURLToHistory into TopSitesImpl

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/base/accelerators/accelerator.cc

Issue 1100763002: Inject CanAddURLToHistory into TopSitesImpl (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@prefs

Patch Set: Fix error introduced during rebase Created 5 years, 8 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:

Index: ui/base/accelerators/accelerator.cc

diff --git a/ui/base/accelerators/accelerator.cc b/ui/base/accelerators/accelerator.cc

index a2e6870681c21bca291d169cb8bfe8c176913b44..4bf3b37ddac017a50a1984d0792bd2d719ec6561 100644

--- a/ui/base/accelerators/accelerator.cc

+++ b/ui/base/accelerators/accelerator.cc

@@ -197,8 +197,7 @@ base::string16 Accelerator::GetShortcutText() const {

key = LOWORD(::MapVirtualKeyW(key_code_, MAPVK_VK_TO_CHAR));

shortcut += key;

#elif defined(USE_AURA) || defined(OS_MACOSX)

- const uint16 c = DomCodeToUsLayoutCharacter(

- UsLayoutKeyboardCodeToDomCode(key_code_), false);

+ const uint16 c = GetCharacterFromKeyCode(key_code_, false);

if (c != 0)

shortcut +=

static_cast<base::string16::value_type>(base::ToUpperASCII(c));