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

Side by Side Diff: webkit/tools/test_shell/test_shell_webkit_init.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/tools/test_shell/test_shell_main.cc ('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) 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/tools/test_shell/test_shell_webkit_init.h" 5 #include "webkit/tools/test_shell/test_shell_webkit_init.h"
6 6
7 #include "base/metrics/stats_counters.h" 7 #include "base/metrics/stats_counters.h"
8 #include "base/path_service.h" 8 #include "base/path_service.h"
9 #include "media/base/media.h" 9 #include "media/base/media.h"
10 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCache.h" 10 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCache.h"
11 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDatabase.h" 11 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDatabase.h"
12 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" 12 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h"
13 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h" 13 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h"
14 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScriptController.h " 14 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScriptController.h "
15 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityPolicy.h" 15 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityPolicy.h"
16 #include "ui/gfx/gl/gl_bindings_skia_in_process.h" 16 #include "ui/gl/gl_bindings_skia_in_process.h"
17 #include "v8/include/v8.h" 17 #include "v8/include/v8.h"
18 #include "webkit/plugins/npapi/plugin_list.h" 18 #include "webkit/plugins/npapi/plugin_list.h"
19 #include "webkit/plugins/webplugininfo.h" 19 #include "webkit/plugins/webplugininfo.h"
20 #include "webkit/tools/test_shell/simple_socket_stream_bridge.h" 20 #include "webkit/tools/test_shell/simple_socket_stream_bridge.h"
21 #include "webkit/tools/test_shell/test_shell.h" 21 #include "webkit/tools/test_shell/test_shell.h"
22 22
23 #if defined(OS_WIN) 23 #if defined(OS_WIN)
24 #include "webkit/tools/test_shell/test_shell_webthemeengine.h" 24 #include "webkit/tools/test_shell/test_shell_webthemeengine.h"
25 #endif 25 #endif
26 26
(...skipping 296 matching lines...) Expand 10 before | Expand all | Expand 10 after
323 const webkit_glue::ResourceLoaderBridge::RequestInfo& request_info) { 323 const webkit_glue::ResourceLoaderBridge::RequestInfo& request_info) {
324 return SimpleResourceLoaderBridge::Create(request_info); 324 return SimpleResourceLoaderBridge::Create(request_info);
325 } 325 }
326 326
327 webkit_glue::WebSocketStreamHandleBridge* 327 webkit_glue::WebSocketStreamHandleBridge*
328 TestShellWebKitInit::CreateWebSocketBridge( 328 TestShellWebKitInit::CreateWebSocketBridge(
329 WebKit::WebSocketStreamHandle* handle, 329 WebKit::WebSocketStreamHandle* handle,
330 webkit_glue::WebSocketStreamHandleDelegate* delegate) { 330 webkit_glue::WebSocketStreamHandleDelegate* delegate) {
331 return SimpleSocketStreamBridge::Create(handle, delegate); 331 return SimpleSocketStreamBridge::Create(handle, delegate);
332 } 332 }
OLDNEW
« no previous file with comments | « webkit/tools/test_shell/test_shell_main.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698