| OLD | NEW | 
|---|
| 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 "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 #include "base/command_line.h" | 9 #include "base/command_line.h" | 
| 10 #include "base/lazy_instance.h" | 10 #include "base/lazy_instance.h" | 
| (...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 160 | 160 | 
| 161   plugin_thread->Send( | 161   plugin_thread->Send( | 
| 162       new PluginProcessHostMsg_GetPluginFinderUrl(plugin_finder_url)); | 162       new PluginProcessHostMsg_GetPluginFinderUrl(plugin_finder_url)); | 
| 163   DCHECK(!plugin_finder_url->empty()); | 163   DCHECK(!plugin_finder_url->empty()); | 
| 164   return true; | 164   return true; | 
| 165 } | 165 } | 
| 166 | 166 | 
| 167 bool IsDefaultPluginEnabled() { | 167 bool IsDefaultPluginEnabled() { | 
| 168 #if defined(OS_WIN) | 168 #if defined(OS_WIN) | 
| 169   return true; | 169   return true; | 
| 170 #elif defined(OS_LINUX) | 170 #elif defined(OS_LINUX) || defined(OS_FREEBSD) | 
| 171   // http://code.google.com/p/chromium/issues/detail?id=10952 | 171   // http://code.google.com/p/chromium/issues/detail?id=10952 | 
| 172   return false; | 172   return false; | 
| 173 #elif defined(OS_MACOSX) | 173 #elif defined(OS_MACOSX) | 
| 174   // http://code.google.com/p/chromium/issues/detail?id=17392 | 174   // http://code.google.com/p/chromium/issues/detail?id=17392 | 
| 175   return false; | 175   return false; | 
| 176 #endif | 176 #endif | 
| 177 } | 177 } | 
| 178 | 178 | 
| 179 // Dispatch the resolve proxy resquest to the right code, depending on which | 179 // Dispatch the resolve proxy resquest to the right code, depending on which | 
| 180 // process the plugin is running in {renderer, browser, plugin}. | 180 // process the plugin is running in {renderer, browser, plugin}. | 
| (...skipping 11 matching lines...) Expand all  Loading... | 
| 192   } | 192   } | 
| 193 | 193 | 
| 194   if (!result || net_error != net::OK) | 194   if (!result || net_error != net::OK) | 
| 195     return false; | 195     return false; | 
| 196 | 196 | 
| 197   *proxy_list = proxy_result; | 197   *proxy_list = proxy_result; | 
| 198   return true; | 198   return true; | 
| 199 } | 199 } | 
| 200 | 200 | 
| 201 } // namespace webkit_glue | 201 } // namespace webkit_glue | 
| OLD | NEW | 
|---|