Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(696)

Issues Search
    My Issues | Starred     Open | Closed | All

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: 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/gfx/native_widget_types.h ('k') | ui/views/focus/accelerator_handler.h » ('j') | webkit/extensions/v8/profiler_extension.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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:
« no previous file with comments | « ui/gfx/native_widget_types.h ('k') | ui/views/focus/accelerator_handler.h » ('j') | webkit/extensions/v8/profiler_extension.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698