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

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

Issue 10392068: ui: Move gl/ directory out of gfx/, up to ui/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix mac_rel Created 8 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « webkit/plugins/npapi/webplugin.h ('k') | webkit/tools/test_shell/test_shell_main.cc » ('j') | 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
(...skipping 27 matching lines...) Expand all
38 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCache.h" 38 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCache.h"
39 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFileSystemCallback s.h" 39 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFileSystemCallback s.h"
40 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" 40 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h"
41 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginParams.h" 41 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginParams.h"
42 #include "third_party/WebKit/Source/WebKit/chromium/public/WebStorageNamespace.h " 42 #include "third_party/WebKit/Source/WebKit/chromium/public/WebStorageNamespace.h "
43 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" 43 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
44 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLError. h" 44 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLError. h"
45 #if defined(TOOLKIT_GTK) 45 #if defined(TOOLKIT_GTK)
46 #include "ui/base/keycodes/keyboard_code_conversion_gtk.h" 46 #include "ui/base/keycodes/keyboard_code_conversion_gtk.h"
47 #endif 47 #endif
48 #include "ui/gfx/gl/gl_context.h" 48 #include "ui/gl/gl_context.h"
49 #include "ui/gfx/gl/gl_implementation.h" 49 #include "ui/gl/gl_implementation.h"
50 #include "ui/gfx/gl/gl_surface.h" 50 #include "ui/gl/gl_surface.h"
51 #include "webkit/appcache/web_application_cache_host_impl.h" 51 #include "webkit/appcache/web_application_cache_host_impl.h"
52 #include "webkit/fileapi/isolated_context.h" 52 #include "webkit/fileapi/isolated_context.h"
53 #include "webkit/glue/user_agent.h" 53 #include "webkit/glue/user_agent.h"
54 #include "webkit/glue/webkit_constants.h" 54 #include "webkit/glue/webkit_constants.h"
55 #include "webkit/glue/webkit_glue.h" 55 #include "webkit/glue/webkit_glue.h"
56 #include "webkit/glue/webkitplatformsupport_impl.h" 56 #include "webkit/glue/webkitplatformsupport_impl.h"
57 #include "webkit/glue/weburlrequest_extradata_impl.h" 57 #include "webkit/glue/weburlrequest_extradata_impl.h"
58 #include "webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h"
58 #include "webkit/gpu/webgraphicscontext3d_in_process_impl.h" 59 #include "webkit/gpu/webgraphicscontext3d_in_process_impl.h"
59 #include "webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h"
60 #include "webkit/media/webmediaplayer_impl.h" 60 #include "webkit/media/webmediaplayer_impl.h"
61 #include "webkit/plugins/npapi/plugin_list.h" 61 #include "webkit/plugins/npapi/plugin_list.h"
62 #include "webkit/plugins/npapi/webplugin_impl.h" 62 #include "webkit/plugins/npapi/webplugin_impl.h"
63 #include "webkit/plugins/npapi/webplugin_page_delegate.h" 63 #include "webkit/plugins/npapi/webplugin_page_delegate.h"
64 #include "webkit/plugins/webplugininfo.h" 64 #include "webkit/plugins/webplugininfo.h"
65 #include "webkit/support/platform_support.h" 65 #include "webkit/support/platform_support.h"
66 #include "webkit/support/simple_database_system.h" 66 #include "webkit/support/simple_database_system.h"
67 #include "webkit/support/test_webkit_platform_support.h" 67 #include "webkit/support/test_webkit_platform_support.h"
68 #include "webkit/support/test_webplugin_page_delegate.h" 68 #include "webkit/support/test_webplugin_page_delegate.h"
69 #include "webkit/tools/test_shell/simple_appcache_system.h" 69 #include "webkit/tools/test_shell/simple_appcache_system.h"
(...skipping 644 matching lines...) Expand 10 before | Expand all | Expand 10 after
714 // Logging 714 // Logging
715 void EnableWebCoreLogChannels(const std::string& channels) { 715 void EnableWebCoreLogChannels(const std::string& channels) {
716 webkit_glue::EnableWebCoreLogChannels(channels); 716 webkit_glue::EnableWebCoreLogChannels(channels);
717 } 717 }
718 718
719 void SetGamepadData(const WebKit::WebGamepads& pads) { 719 void SetGamepadData(const WebKit::WebGamepads& pads) {
720 test_environment->webkit_platform_support()->setGamepadData(pads); 720 test_environment->webkit_platform_support()->setGamepadData(pads);
721 } 721 }
722 722
723 } // namespace webkit_support 723 } // namespace webkit_support
OLDNEW
« no previous file with comments | « webkit/plugins/npapi/webplugin.h ('k') | webkit/tools/test_shell/test_shell_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698