Enable NPAPI if policy has plugin policies.
commit26d09db19381c2236a2890c045761465c78bc958
authorwfh <wfh@chromium.org>
Sat, 11 Apr 2015 02:24:00 +0000 (10 19:24 -0700)
committerCommit bot <commit-bot@chromium.org>
Sat, 11 Apr 2015 02:24:30 +0000 (11 02:24 +0000)
treeabafedd0ec0c700d3a9a91d8574ea782c3ae902e
parentcd7a39ac205a3c9c8110ef9f2d42f44196fa49c9
Enable NPAPI if policy has plugin policies.

BUG=472648
TEST=manual - verify that NPAPI plugins appear in chrome://plugins when either a machine or user plugin policy is set.

Review URL: https://codereview.chromium.org/1071713004

Cr-Commit-Position: refs/heads/master@{#324754}
17 files changed:
chrome/browser/BUILD.gn
chrome/browser/plugins/enable_npapi_plugins_policy_handler.cc [new file with mode: 0644]
chrome/browser/plugins/enable_npapi_plugins_policy_handler.h [new file with mode: 0644]
chrome/browser/plugins/plugin_prefs.cc
chrome/browser/plugins/plugin_prefs.h
chrome/browser/plugins/plugin_prefs_factory.cc
chrome/browser/policy/chrome_browser_policy_connector.cc
chrome/browser/policy/chrome_browser_policy_connector.h
chrome/browser/policy/configuration_policy_handler_list_factory.cc
chrome/chrome_browser.gypi
chrome/common/pref_names.cc
chrome/common/pref_names.h
content/browser/plugin_service_impl.cc
content/browser/plugin_service_impl.h
content/public/browser/plugin_service.h
content/test/fake_plugin_service.cc
content/test/fake_plugin_service.h