Plugin Power Saver: Add back 'Click to play' option as 4th for plugins.
commitb0590224eda6183ecc592307301e9b79a8f084ed
authortommycli <tommycli@chromium.org>
Fri, 9 Jan 2015 01:02:58 +0000 (8 17:02 -0800)
committerCommit bot <commit-bot@chromium.org>
Fri, 9 Jan 2015 01:03:41 +0000 (9 01:03 +0000)
treea82be0a24728e5d3a583d1d4adbab40301ee6807
parentd7dd21abc088c4fbb0d67dcde2ae9f8f0120ec76
Plugin Power Saver: Add back 'Click to play' option as 4th for plugins.

This is a partial revert of the following patches:
https://codereview.chromium.org/796543002/
https://codereview.chromium.org/819183002/

BUG=443978, 403800

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

Cr-Commit-Position: refs/heads/master@{#310646}
15 files changed:
chrome/app/generated_resources.grd
chrome/browser/content_settings/host_content_settings_map_unittest.cc
chrome/browser/plugins/plugin_info_message_filter.cc
chrome/browser/prerender/prerender_browsertest.cc
chrome/browser/resources/options/content_settings.html
chrome/browser/resources/options/content_settings_exceptions_area.js
chrome/browser/ui/website_settings/website_settings_ui.cc
chrome/browser/ui/webui/options/content_settings_handler.cc
chrome/common/render_messages.h
chrome/renderer/chrome_content_renderer_client.cc
chrome/renderer/resources/click_to_play_plugin.html [new file with mode: 0644]
chrome/renderer/resources/renderer_resources.grd
chrome/test/data/policy/policy_test_cases.json
chrome/test/data/prerender/prerender_plugin_click_to_play.html [new file with mode: 0644]
tools/metrics/actions/actions.xml