diff options
| author | saintlou@chromium.org <saintlou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-04 22:58:08 +0000 |
|---|---|---|
| committer | saintlou@chromium.org <saintlou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-04 22:58:08 +0000 |
| commit | cfbe37cf3fc6f35c356b6ab11ec9af540f8481aa (patch) | |
| tree | 2659d226e10e454df2bb8f29decc81dcba79ac42 /webkit/support | |
| parent | 6cd5d5098b1559611c4ac667b3a1067231ddfb55 (diff) | |
| download | chromium_src-cfbe37cf3fc6f35c356b6ab11ec9af540f8481aa.zip chromium_src-cfbe37cf3fc6f35c356b6ab11ec9af540f8481aa.tar.gz chromium_src-cfbe37cf3fc6f35c356b6ab11ec9af540f8481aa.tar.bz2 | |
These changes are requires to build Aura without relying on GTK.
The CL rename webkit/support/platform_support_gtk.cc which was really non GTK specific.
TBR=tony@chromium.org
BUG=97131
TEST=none
Review URL: http://codereview.chromium.org/8093011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104013 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/support')
| -rw-r--r-- | webkit/support/platform_support_linux.cc (renamed from webkit/support/platform_support_gtk.cc) | 0 | ||||
| -rw-r--r-- | webkit/support/webkit_support.cc | 4 | ||||
| -rw-r--r-- | webkit/support/webkit_support.gypi | 2 | ||||
| -rw-r--r-- | webkit/support/webkit_support.h | 2 |
4 files changed, 4 insertions, 4 deletions
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 |