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 "chrome/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/thread_local.h" | 21 #include "base/thread_local.h" |
22 #include "chrome/common/child_process.h" | 22 #include "chrome/common/child_process.h" |
23 #include "chrome/common/chrome_plugin_lib.h" | 23 #include "chrome/common/chrome_plugin_lib.h" |
24 #include "chrome/common/chrome_switches.h" | 24 #include "chrome/common/chrome_switches.h" |
25 #include "chrome/common/plugin_messages.h" | 25 #include "chrome/common/plugin_messages.h" |
26 #include "chrome/common/render_messages.h" | 26 #include "chrome/common/render_messages.h" |
27 #include "chrome/plugin/chrome_plugin_host.h" | 27 #include "chrome/plugin/chrome_plugin_host.h" |
28 #include "chrome/plugin/npobject_util.h" | 28 #include "chrome/plugin/npobject_util.h" |
29 #include "chrome/renderer/render_thread.h" | 29 #include "chrome/renderer/render_thread.h" |
| 30 #include "ipc/ipc_channel_handle.h" |
30 #include "net/base/net_errors.h" | 31 #include "net/base/net_errors.h" |
31 #include "webkit/glue/plugins/plugin_lib.h" | 32 #include "webkit/glue/plugins/plugin_lib.h" |
32 #include "webkit/glue/webkit_glue.h" | 33 #include "webkit/glue/webkit_glue.h" |
33 #include "webkit/glue/plugins/webplugin_delegate_impl.h" | 34 #include "webkit/glue/plugins/webplugin_delegate_impl.h" |
34 | 35 |
35 #if defined(USE_X11) | 36 #if defined(USE_X11) |
36 #include "app/x11_util.h" | 37 #include "app/x11_util.h" |
37 #elif defined(OS_MACOSX) | 38 #elif defined(OS_MACOSX) |
38 #include "app/l10n_util.h" | 39 #include "app/l10n_util.h" |
39 #include "base/mac_util.h" | 40 #include "base/mac_util.h" |
(...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
234 } | 235 } |
235 | 236 |
236 if (!result || net_error != net::OK) | 237 if (!result || net_error != net::OK) |
237 return false; | 238 return false; |
238 | 239 |
239 *proxy_list = proxy_result; | 240 *proxy_list = proxy_result; |
240 return true; | 241 return true; |
241 } | 242 } |
242 | 243 |
243 } // namespace webkit_glue | 244 } // namespace webkit_glue |
OLD | NEW |