OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 "chrome/plugin/plugin_thread.h" | 5 #include "content/plugin/plugin_thread.h" |
6 | 6 |
7 #include "build/build_config.h" | 7 #include "build/build_config.h" |
8 | 8 |
9 #if defined(USE_X11) | 9 #if defined(USE_X11) |
10 #include <gtk/gtk.h> | 10 #include <gtk/gtk.h> |
11 #elif defined(OS_MACOSX) | 11 #elif defined(OS_MACOSX) |
12 #include <CoreFoundation/CoreFoundation.h> | 12 #include <CoreFoundation/CoreFoundation.h> |
13 #endif | 13 #endif |
14 | 14 |
15 #include <string> | 15 #include <string> |
16 #include <vector> | 16 #include <vector> |
17 | 17 |
18 #include "base/command_line.h" | 18 #include "base/command_line.h" |
19 #include "base/lazy_instance.h" | 19 #include "base/lazy_instance.h" |
20 #include "base/process_util.h" | 20 #include "base/process_util.h" |
21 #include "base/threading/thread_local.h" | 21 #include "base/threading/thread_local.h" |
22 #include "chrome/plugin/npobject_util.h" | |
23 #include "chrome/renderer/render_thread.h" | |
24 #include "content/common/child_process.h" | 22 #include "content/common/child_process.h" |
25 #include "content/common/content_client.h" | 23 #include "content/common/content_client.h" |
26 #include "content/common/content_switches.h" | 24 #include "content/common/content_switches.h" |
27 #include "content/common/child_process_messages.h" | 25 #include "content/common/child_process_messages.h" |
28 #include "content/common/plugin_messages.h" | 26 #include "content/common/plugin_messages.h" |
| 27 #include "content/plugin/npobject_util.h" |
29 #include "ipc/ipc_channel_handle.h" | 28 #include "ipc/ipc_channel_handle.h" |
30 #include "net/base/net_errors.h" | 29 #include "net/base/net_errors.h" |
31 #include "webkit/glue/webkit_glue.h" | 30 #include "webkit/glue/webkit_glue.h" |
32 #include "webkit/plugins/npapi/plugin_lib.h" | 31 #include "webkit/plugins/npapi/plugin_lib.h" |
33 #include "webkit/plugins/npapi/webplugin_delegate_impl.h" | 32 #include "webkit/plugins/npapi/webplugin_delegate_impl.h" |
34 | 33 |
35 #if defined(TOOLKIT_USES_GTK) | 34 #if defined(TOOLKIT_USES_GTK) |
36 #include "ui/gfx/gtk_util.h" | 35 #include "ui/gfx/gtk_util.h" |
37 #endif | 36 #endif |
38 | 37 |
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
185 bool result = ChildThread::current()->Send( | 184 bool result = ChildThread::current()->Send( |
186 new ChildProcessHostMsg_ResolveProxy(url, &net_error, &proxy_result)); | 185 new ChildProcessHostMsg_ResolveProxy(url, &net_error, &proxy_result)); |
187 if (!result || net_error != net::OK) | 186 if (!result || net_error != net::OK) |
188 return false; | 187 return false; |
189 | 188 |
190 *proxy_list = proxy_result; | 189 *proxy_list = proxy_result; |
191 return true; | 190 return true; |
192 } | 191 } |
193 | 192 |
194 } // namespace webkit_glue | 193 } // namespace webkit_glue |
OLD | NEW |