diff options
| author | pastarmovj@chromium.org <pastarmovj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-25 12:36:37 +0000 |
|---|---|---|
| committer | pastarmovj@chromium.org <pastarmovj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-25 12:36:37 +0000 |
| commit | 8b08a47f878f0ed77508d6c49bf4e593ea8f2bef (patch) | |
| tree | 7575f86aa79e27ce1bb9c61a272c11dde474da6a /content | |
| parent | 0f38dc4551ef947f74259b3e7c92b984bf554c60 (diff) | |
| download | chromium_src-8b08a47f878f0ed77508d6c49bf4e593ea8f2bef.zip chromium_src-8b08a47f878f0ed77508d6c49bf4e593ea8f2bef.tar.gz chromium_src-8b08a47f878f0ed77508d6c49bf4e593ea8f2bef.tar.bz2 | |
Implemented policy to disable plugin finder.
BUG=49597
TEST=Set the policy to true and the default plugin should not offer to install missing plugins.
Review URL: http://codereview.chromium.org/6475011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76043 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/browser/plugin_process_host.cc | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/content/browser/plugin_process_host.cc b/content/browser/plugin_process_host.cc index 215f653..6c42164 100644 --- a/content/browser/plugin_process_host.cc +++ b/content/browser/plugin_process_host.cc @@ -20,6 +20,7 @@ #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/chrome_plugin_browsing_context.h" #include "chrome/browser/net/url_request_tracking.h" #include "chrome/browser/plugin_download_helper.h" @@ -455,14 +456,19 @@ void PluginProcessHost::OnChannelCreated( } void PluginProcessHost::OnGetPluginFinderUrl(std::string* plugin_finder_url) { + // TODO(bauerb): Move this method to MessageFilter. if (!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->plugin_finder_disabled()) { + // TODO(iyengar): Add the plumbing to retrieve the default + // plugin finder URL. + *plugin_finder_url = kDefaultPluginFinderURL; + } else { + plugin_finder_url->clear(); + } } void PluginProcessHost::OnPluginMessage( |