Chromium Code Reviews| Index: chrome/browser/plugin_process_host.cc |
| diff --git a/chrome/browser/plugin_process_host.cc b/chrome/browser/plugin_process_host.cc |
| index c15b030fe73a90f2f1abde444110659a7460211c..80410ba4fb58df531ee1ff03aafceafa83c4c42d 100644 |
| --- a/chrome/browser/plugin_process_host.cc |
| +++ b/chrome/browser/plugin_process_host.cc |
| @@ -20,12 +20,14 @@ |
| #include "base/path_service.h" |
| #include "base/string_util.h" |
| #include "base/utf_string_conversions.h" |
| +#include "chrome/browser/browser_process.h" |
| #include "chrome/browser/browser_thread.h" |
| #include "chrome/browser/child_process_security_policy.h" |
| #include "chrome/browser/chrome_plugin_browsing_context.h" |
| #include "chrome/browser/net/url_request_tracking.h" |
| #include "chrome/browser/plugin_download_helper.h" |
| #include "chrome/browser/plugin_service.h" |
| +#include "chrome/browser/prefs/pref_service.h" |
| #include "chrome/browser/profiles/profile.h" |
| #include "chrome/browser/renderer_host/resource_dispatcher_host.h" |
| #include "chrome/browser/renderer_host/resource_message_filter.h" |
| @@ -35,6 +37,7 @@ |
| #include "chrome/common/logging_chrome.h" |
| #include "chrome/common/net/url_request_context_getter.h" |
| #include "chrome/common/plugin_messages.h" |
| +#include "chrome/common/pref_names.h" |
| #include "chrome/common/render_messages.h" |
| #include "chrome/common/render_messages_params.h" |
| #include "ipc/ipc_switches.h" |
| @@ -459,10 +462,13 @@ void PluginProcessHost::OnGetPluginFinderUrl(std::string* plugin_finder_url) { |
| NOTREACHED(); |
| return; |
| } |
| - |
| - // TODO(iyengar) Add the plumbing to retrieve the default |
| - // plugin finder URL. |
| - *plugin_finder_url = kDefaultPluginFinderURL; |
| + if (!g_browser_process->disable_plugin_finder_pref()) { |
|
Bernhard Bauer
2011/02/24 10:37:07
Why is this no longer in the newest version of the
pastarmovj
2011/02/24 16:02:20
Sorry when rebasing to ToT this file got lost as i
|
| + // TODO(iyengar) Add the plumbing to retrieve the default |
| + // plugin finder URL. |
| + *plugin_finder_url = kDefaultPluginFinderURL; |
| + } else { |
| + plugin_finder_url->clear(); |
| + } |
| } |
| void PluginProcessHost::OnPluginMessage( |