| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "content/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) |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 67 // environment variable! So set it again. | 67 // environment variable! So set it again. |
| 68 setenv("GDK_NATIVE_WINDOWS", "1", 1); | 68 setenv("GDK_NATIVE_WINDOWS", "1", 1); |
| 69 } | 69 } |
| 70 | 70 |
| 71 ui::SetDefaultX11ErrorHandlers(); | 71 ui::SetDefaultX11ErrorHandlers(); |
| 72 #endif | 72 #endif |
| 73 | 73 |
| 74 PatchNPNFunctions(); | 74 PatchNPNFunctions(); |
| 75 | 75 |
| 76 // Preload the library to avoid loading, unloading then reloading | 76 // Preload the library to avoid loading, unloading then reloading |
| 77 preloaded_plugin_module_ = base::LoadNativeLibrary(plugin_path_); | 77 preloaded_plugin_module_ = base::LoadNativeLibrary(plugin_path_, NULL); |
| 78 | 78 |
| 79 scoped_refptr<webkit::npapi::PluginLib> plugin( | 79 scoped_refptr<webkit::npapi::PluginLib> plugin( |
| 80 webkit::npapi::PluginLib::CreatePluginLib(plugin_path_)); | 80 webkit::npapi::PluginLib::CreatePluginLib(plugin_path_)); |
| 81 if (plugin.get()) | 81 if (plugin.get()) |
| 82 plugin->NP_Initialize(); | 82 plugin->NP_Initialize(); |
| 83 | 83 |
| 84 content::GetContentClient()->plugin()->PluginProcessStarted( | 84 content::GetContentClient()->plugin()->PluginProcessStarted( |
| 85 plugin.get() ? plugin->plugin_info().name : string16()); | 85 plugin.get() ? plugin->plugin_info().name : string16()); |
| 86 | 86 |
| 87 // Certain plugins, such as flash, steal the unhandled exception filter | 87 // Certain plugins, such as flash, steal the unhandled exception filter |
| (...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 184 bool result = ChildThread::current()->Send( | 184 bool result = ChildThread::current()->Send( |
| 185 new ChildProcessHostMsg_ResolveProxy(url, &net_error, &proxy_result)); | 185 new ChildProcessHostMsg_ResolveProxy(url, &net_error, &proxy_result)); |
| 186 if (!result || net_error != net::OK) | 186 if (!result || net_error != net::OK) |
| 187 return false; | 187 return false; |
| 188 | 188 |
| 189 *proxy_list = proxy_result; | 189 *proxy_list = proxy_result; |
| 190 return true; | 190 return true; |
| 191 } | 191 } |
| 192 | 192 |
| 193 } // namespace webkit_glue | 193 } // namespace webkit_glue |
| OLD | NEW |