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

Side by Side Diff: webkit/support/webkit_support.cc

Issue 7740048: Chrome Linux DRT nativeKeyCode helper (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Patch for trys and landing. Created 9 years, 3 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « webkit/support/webkit_support.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "webkit/support/webkit_support.h" 5 #include "webkit/support/webkit_support.h"
6 6
7 #include "base/at_exit.h" 7 #include "base/at_exit.h"
8 #include "base/base64.h" 8 #include "base/base64.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/debug/debugger.h" 10 #include "base/debug/debugger.h"
(...skipping 19 matching lines...) Expand all
30 #include "media/base/media_log.h" 30 #include "media/base/media_log.h"
31 #include "media/base/message_loop_factory_impl.h" 31 #include "media/base/message_loop_factory_impl.h"
32 #include "net/base/escape.h" 32 #include "net/base/escape.h"
33 #include "net/base/net_errors.h" 33 #include "net/base/net_errors.h"
34 #include "net/base/net_util.h" 34 #include "net/base/net_util.h"
35 #include "testing/gtest/include/gtest/gtest.h" 35 #include "testing/gtest/include/gtest/gtest.h"
36 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFileSystemCallback s.h" 36 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFileSystemCallback s.h"
37 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" 37 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h"
38 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginParams.h" 38 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginParams.h"
39 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLError.h" 39 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLError.h"
40 #if defined(OS_LINUX)
41 #include "ui/base/keycodes/keyboard_code_conversion_gtk.h"
42 #endif
40 #include "ui/gfx/gl/gl_context.h" 43 #include "ui/gfx/gl/gl_context.h"
41 #include "ui/gfx/gl/gl_implementation.h" 44 #include "ui/gfx/gl/gl_implementation.h"
42 #include "ui/gfx/gl/gl_surface.h" 45 #include "ui/gfx/gl/gl_surface.h"
43 #include "webkit/appcache/web_application_cache_host_impl.h" 46 #include "webkit/appcache/web_application_cache_host_impl.h"
44 #include "webkit/glue/media/video_renderer_impl.h" 47 #include "webkit/glue/media/video_renderer_impl.h"
45 #include "webkit/glue/webkit_constants.h" 48 #include "webkit/glue/webkit_constants.h"
46 #include "webkit/glue/webkit_glue.h" 49 #include "webkit/glue/webkit_glue.h"
47 #include "webkit/glue/webkitclient_impl.h" 50 #include "webkit/glue/webkitclient_impl.h"
48 #include "webkit/glue/webmediaplayer_impl.h" 51 #include "webkit/glue/webmediaplayer_impl.h"
49 #include "webkit/plugins/npapi/plugin_list.h" 52 #include "webkit/plugins/npapi/plugin_list.h"
(...skipping 555 matching lines...) Expand 10 before | Expand all | Expand 10 after
605 } 608 }
606 609
607 // FileSystem 610 // FileSystem
608 void OpenFileSystem(WebFrame* frame, WebFileSystem::Type type, 611 void OpenFileSystem(WebFrame* frame, WebFileSystem::Type type,
609 long long size, bool create, WebFileSystemCallbacks* callbacks) { 612 long long size, bool create, WebFileSystemCallbacks* callbacks) {
610 SimpleFileSystem* fileSystem = static_cast<SimpleFileSystem*>( 613 SimpleFileSystem* fileSystem = static_cast<SimpleFileSystem*>(
611 test_environment->webkit_client()->fileSystem()); 614 test_environment->webkit_client()->fileSystem());
612 fileSystem->OpenFileSystem(frame, type, size, create, callbacks); 615 fileSystem->OpenFileSystem(frame, type, size, create, callbacks);
613 } 616 }
614 617
618 // Keyboard code
619 #if defined(OS_LINUX)
620 int NativeKeyCodeForWindowsKeyCode(int keycode, bool shift) {
621 ui::KeyboardCode code = static_cast<ui::KeyboardCode>(keycode);
622 return ui::GdkNativeKeyCodeForWindowsKeyCode(code, shift);
623 }
624 #endif
625
615 // Timers 626 // Timers
616 double GetForegroundTabTimerInterval() { 627 double GetForegroundTabTimerInterval() {
617 return webkit_glue::kForegroundTabTimerInterval; 628 return webkit_glue::kForegroundTabTimerInterval;
618 } 629 }
619 630
620 } // namespace webkit_support 631 } // namespace webkit_support
OLDNEW
« no previous file with comments | « webkit/support/webkit_support.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698