5 files changed, 4 insertions, 7 deletions
diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi
index 596c8fa..28d88fd 100644
--- a/webkit/glue/webkit_glue.gypi
+++ b/webkit/glue/webkit_glue.gypi
@@ -463,9 +463,6 @@
           'sources!': [
             'plugins/plugin_stubs.cc',
           ],
-        }, { # else: toolkit_uses_gtk != 1
-          'sources/': [['exclude', '_(linux|gtk)(_data)?\\.cc$'],
-                       ['exclude', r'/gtk_']],
         }],
         ['use_aura==1', {
           'sources/': [
diff --git a/webkit/support/platform_support_gtk.cc b/webkit/support/platform_support_linux.cc
index b315958..b315958 100644
--- a/webkit/support/platform_support_gtk.cc
+++ b/webkit/support/platform_support_linux.cc
diff --git a/webkit/support/webkit_support.cc b/webkit/support/webkit_support.cc
index 08f853f..681c25d 100644
--- a/webkit/support/webkit_support.cc
+++ b/webkit/support/webkit_support.cc
@@ -37,7 +37,7 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginParams.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLError.h"
-#if defined(OS_LINUX)
+#if defined(TOOLKIT_USES_GTK)
 #include "ui/base/keycodes/keyboard_code_conversion_gtk.h"
 #endif
 #include "ui/gfx/gl/gl_context.h"
@@ -631,7 +631,7 @@ void OpenFileSystem(WebFrame* frame, WebFileSystem::Type type,
 }
 
 // Keyboard code
-#if defined(OS_LINUX)
+#if defined(TOOLKIT_USES_GTK)
 int NativeKeyCodeForWindowsKeyCode(int keycode, bool shift) {
   ui::KeyboardCode code = static_cast<ui::KeyboardCode>(keycode);
   return ui::GdkNativeKeyCodeForWindowsKeyCode(code, shift);
diff --git a/webkit/support/webkit_support.gypi b/webkit/support/webkit_support.gypi
index 2748c06..4ef4b25 100644
--- a/webkit/support/webkit_support.gypi
+++ b/webkit/support/webkit_support.gypi
@@ -38,7 +38,7 @@
         'drt_application_mac.mm',
         'platform_support.h',
         'platform_support_android.cc',
-        'platform_support_gtk.cc',
+        'platform_support_linux.cc',
         'platform_support_mac.mm',
         'platform_support_win.cc',
         'test_webkit_platform_support.cc',
diff --git a/webkit/support/webkit_support.h b/webkit/support/webkit_support.h
index 9186bd5..dd93335 100644
--- a/webkit/support/webkit_support.h
+++ b/webkit/support/webkit_support.h
@@ -212,7 +212,7 @@ enum {
     VKEY_F1 = ui::VKEY_F1,
 };
 
-#if defined(OS_LINUX)
+#if defined(TOOLKIT_USES_GTK)
 int NativeKeyCodeForWindowsKeyCode(int keycode, bool shift);
 #endif