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

Side by Side Diff: webkit/tools/test_shell/test_shell_gtk.cc

Issue 387020: Upstreaming WebKit.gyp (Closed)
Patch Set: Created 11 years, 1 month 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
« no previous file with comments | « webkit/tools/test_shell/test_shell.gyp ('k') | webkit/tools/test_shell/test_shell_mac.mm » ('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) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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.h" 5 #include "webkit/tools/test_shell/test_shell.h"
6 6
7 #include <errno.h> 7 #include <errno.h>
8 #include <fcntl.h> 8 #include <fcntl.h>
9 #include <fontconfig/fontconfig.h> 9 #include <fontconfig/fontconfig.h>
10 #include <gtk/gtk.h> 10 #include <gtk/gtk.h>
11 #include <signal.h> 11 #include <signal.h>
12 #include <unistd.h> 12 #include <unistd.h>
13 13
14 #include "base/data_pack.h" 14 #include "base/data_pack.h"
15 #include "base/file_path.h" 15 #include "base/file_path.h"
16 #include "base/file_util.h" 16 #include "base/file_util.h"
17 #include "base/message_loop.h" 17 #include "base/message_loop.h"
18 #include "base/path_service.h" 18 #include "base/path_service.h"
19 #include "base/string16.h" 19 #include "base/string16.h"
20 #include "base/string_piece.h" 20 #include "base/string_piece.h"
21 #include "base/string_util.h" 21 #include "base/string_util.h"
22 #include "grit/test_shell_resources.h" 22 #include "grit/test_shell_resources.h"
23 #include "grit/webkit_resources.h" 23 #include "grit/webkit_resources.h"
24 #include "net/base/mime_util.h" 24 #include "net/base/mime_util.h"
25 #include "net/base/net_util.h" 25 #include "net/base/net_util.h"
26 #include "webkit/api/public/WebFrame.h" 26 #include "third_party/WebKit/WebKit/chromium/public/WebFrame.h"
27 #include "webkit/api/public/WebPoint.h" 27 #include "third_party/WebKit/WebKit/chromium/public/WebPoint.h"
28 #include "webkit/api/public/WebView.h" 28 #include "third_party/WebKit/WebKit/chromium/public/WebView.h"
29 #include "webkit/glue/plugins/plugin_list.h" 29 #include "webkit/glue/plugins/plugin_list.h"
30 #include "webkit/glue/resource_loader_bridge.h" 30 #include "webkit/glue/resource_loader_bridge.h"
31 #include "webkit/glue/webkit_glue.h" 31 #include "webkit/glue/webkit_glue.h"
32 #include "webkit/glue/webpreferences.h" 32 #include "webkit/glue/webpreferences.h"
33 #include "webkit/tools/test_shell/test_navigation_controller.h" 33 #include "webkit/tools/test_shell/test_navigation_controller.h"
34 #include "webkit/tools/test_shell/test_webview_delegate.h" 34 #include "webkit/tools/test_shell/test_webview_delegate.h"
35 35
36 using WebKit::WebPoint; 36 using WebKit::WebPoint;
37 using WebKit::WebWidget; 37 using WebKit::WebWidget;
38 38
(...skipping 633 matching lines...) Expand 10 before | Expand all | Expand 10 after
672 break; 672 break;
673 } 673 }
674 return TestShell::NetResourceProvider(resource_id); 674 return TestShell::NetResourceProvider(resource_id);
675 } 675 }
676 676
677 void GetPlugins(bool refresh, std::vector<WebPluginInfo>* plugins) { 677 void GetPlugins(bool refresh, std::vector<WebPluginInfo>* plugins) {
678 NPAPI::PluginList::Singleton()->GetPlugins(refresh, plugins); 678 NPAPI::PluginList::Singleton()->GetPlugins(refresh, plugins);
679 } 679 }
680 680
681 } // namespace webkit_glue 681 } // namespace webkit_glue
OLDNEW
« no previous file with comments | « webkit/tools/test_shell/test_shell.gyp ('k') | webkit/tools/test_shell/test_shell_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698