diff options
| author | chromium@hybridsource.org <chromium@hybridsource.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-25 23:44:58 +0000 |
|---|---|---|
| committer | chromium@hybridsource.org <chromium@hybridsource.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-25 23:44:58 +0000 |
| commit | 2ec8df5602bedf518d0119005690b101d5b598ef (patch) | |
| tree | 04b9d44fdc22ceab2d10a02108765729062241c4 /ui/views | |
| parent | 88efcce0d60e09489d8a3761f4c8fd0d4b51c625 (diff) | |
| download | chromium_src-2ec8df5602bedf518d0119005690b101d5b598ef.zip chromium_src-2ec8df5602bedf518d0119005690b101d5b598ef.tar.gz chromium_src-2ec8df5602bedf518d0119005690b101d5b598ef.tar.bz2 | |
Made the OS_LINUX ifdefs in ui/ and webkit/ directories more cross-platform, so that these files can be used on multiple POSIX platforms.
Review URL: http://codereview.chromium.org/6990051
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86742 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views')
| -rw-r--r-- | ui/views/events/accelerator.cc | 4 | ||||
| -rw-r--r-- | ui/views/focus/accelerator_handler.h | 2 | ||||
| -rw-r--r-- | ui/views/focus/focus_manager.cc | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/ui/views/events/accelerator.cc b/ui/views/events/accelerator.cc index 1e8592f..c80f63e 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: diff --git a/ui/views/focus/accelerator_handler.h b/ui/views/focus/accelerator_handler.h index 3f129ba..c241d0e 100644 --- a/ui/views/focus/accelerator_handler.h +++ b/ui/views/focus/accelerator_handler.h @@ -8,7 +8,7 @@ #include "build/build_config.h" -#if defined(OS_LINUX) +#if defined(TOOLKIT_USES_GTK) #include <gdk/gdk.h> #endif diff --git a/ui/views/focus/focus_manager.cc b/ui/views/focus/focus_manager.cc index 8961bca..6e1e953 100644 --- a/ui/views/focus/focus_manager.cc +++ b/ui/views/focus/focus_manager.cc @@ -8,7 +8,7 @@ #include "build/build_config.h" -#if defined(OS_LINUX) +#if defined(TOOLKIT_USES_GTK) #include <gtk/gtk.h> #endif |