| 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> |
| (...skipping 16 matching lines...) Expand all Loading... |
| 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 "ipc/ipc_channel_handle.h" |
| 31 #include "net/base/net_errors.h" | 31 #include "net/base/net_errors.h" |
| 32 #include "webkit/glue/webkit_glue.h" | 32 #include "webkit/glue/webkit_glue.h" |
| 33 #include "webkit/plugins/npapi/plugin_lib.h" | 33 #include "webkit/plugins/npapi/plugin_lib.h" |
| 34 #include "webkit/plugins/npapi/webplugin_delegate_impl.h" | 34 #include "webkit/plugins/npapi/webplugin_delegate_impl.h" |
| 35 | 35 |
| 36 #if defined(TOOLKIT_USES_GTK) | 36 #if defined(TOOLKIT_USES_GTK) |
| 37 #include "gfx/gtk_util.h" | 37 #include "ui/gfx/gtk_util.h" |
| 38 #endif | 38 #endif |
| 39 | 39 |
| 40 #if defined(USE_X11) | 40 #if defined(USE_X11) |
| 41 #include "ui/base/x/x11_util.h" | 41 #include "ui/base/x/x11_util.h" |
| 42 #elif defined(OS_MACOSX) | 42 #elif defined(OS_MACOSX) |
| 43 #include "base/mac/mac_util.h" | 43 #include "base/mac/mac_util.h" |
| 44 #include "base/mac/scoped_cftyperef.h" | 44 #include "base/mac/scoped_cftyperef.h" |
| 45 #include "base/sys_string_conversions.h" | 45 #include "base/sys_string_conversions.h" |
| 46 #include "grit/chromium_strings.h" | 46 #include "grit/chromium_strings.h" |
| 47 #include "ui/base/l10n/l10n_util.h" | 47 #include "ui/base/l10n/l10n_util.h" |
| (...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 228 } | 228 } |
| 229 | 229 |
| 230 if (!result || net_error != net::OK) | 230 if (!result || net_error != net::OK) |
| 231 return false; | 231 return false; |
| 232 | 232 |
| 233 *proxy_list = proxy_result; | 233 *proxy_list = proxy_result; |
| 234 return true; | 234 return true; |
| 235 } | 235 } |
| 236 | 236 |
| 237 } // namespace webkit_glue | 237 } // namespace webkit_glue |
| OLD | NEW |