ui/base/accelerators/accelerator.cc - Issue 660173002: Type conversion fixes, ui/ edition.

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 660173002: Type conversion fixes, ui/ edition. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix compile Created 6 years, 2 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 4627e88a1e2d3c9c9e2f1e68a0d54a57462766b8..b4a8cc64510a02c123b77083cbd2a30352f82a6e 100644

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

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

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

// default zoom level), we leave VK_[0-9] alone without translation.

wchar_t key;

if (key_code_ >= '0' && key_code_ <= '9')

- key = key_code_;

+ key = static_cast<wchar_t>(key_code_);

else

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

shortcut += key;