ui/views/events/accelerator.cc - Issue 6990051: Unix ifdefs patch for ui/ and webkit/

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/views/events/accelerator.cc

Issue 6990051: Unix ifdefs patch for ui/ and webkit/ (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk

Patch Set: removed some too general ifdefs and ppapi changes Created 9 years, 7 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/views/events/accelerator.cc

diff --git a/ui/views/events/accelerator.cc b/ui/views/events/accelerator.cc

index 1e8592f2007a8c0741f86a97d997c7909e3b3018..c80f63e17bdb645b12654d0aed34c4d682643251 100644

--- a/ui/views/events/accelerator.cc

+++ b/ui/views/events/accelerator.cc

@@ -6,7 +6,7 @@

#if defined(OS_WIN)

#include <windows.h>

-#elif defined(OS_LINUX)

+#elif defined(TOOLKIT_USES_GTK)

#include <gdk/gdk.h>

#endif

@@ -99,7 +99,7 @@ string16 GetShortcutTextForAccelerator(const Accelerator& accelerator) {

else

key = LOWORD(::MapVirtualKeyW(accelerator.key_code(), MAPVK_VK_TO_CHAR));

shortcut += key;

-#elif defined(OS_LINUX)

+#elif defined(TOOLKIT_USES_GTK)

const gchar* name = NULL;

switch (accelerator.key_code()) {

case ui::VKEY_OEM_2: