angler-fishThe Vulnerability History Project

Plugin Power Saver: Implement option in Settings.

      Relevant review here: https://groups.google.com/a/google.com/d/msg/chrome-ui-review/i5ii03kq8sg/LlItQiRRmjkJ

BUG=403800

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

Cr-Commit-Position: refs/heads/master@{#308876}
by Dean the Crab 2014-12-17 23:17:44 UTC
commit a23713b67ee741e5bb026d99e86b8c97cc9ab84d
Chromium
chrome/app/generated_resources.grd
+12 -18
chrome/browser/android/preferences/pref_service_bridge.cc
-2
chrome/browser/chrome_content_browser_client.cc
-1
chrome/browser/content_settings/host_content_settings_map_unittest.cc
+7 -17
chrome/browser/plugins/plugin_info_message_filter.cc
+4 -7
chrome/browser/plugins/plugin_info_message_filter_unittest.cc
+9 -9
chrome/browser/prerender/prerender_browsertest.cc
+7 -11
chrome/browser/resources/options/content_settings.html
+4 -4
chrome/browser/resources/options/content_settings_exceptions_area.js
+20 -10
chrome/browser/ui/website_settings/permission_menu_model.cc
-4
chrome/browser/ui/website_settings/website_settings_ui.cc
+24 -24
chrome/browser/ui/webui/options/content_settings_handler.cc
+122 -118
chrome/browser/ui/webui/options/content_settings_handler.h
+5
chrome/browser/ui/webui/options/website_settings_handler.cc
+17 -9
chrome/browser/ui/webui/options/website_settings_handler.h
+5
chrome/common/render_messages.h
+1 -1
chrome/renderer/chrome_content_renderer_client.cc
+23 -12
chrome/renderer/resources/click_to_play_plugin.html
+57
chrome/renderer/resources/renderer_resources.grd
+1
chrome/test/data/policy/policy_test_cases.json
+3 -1
chrome/test/data/prerender/{prerender_plugin_power_saver.html => prerender_plugin_click_to_play.html}
+7 -5
components/content_settings/core/browser/content_settings_utils.cc
-4
components/content_settings/core/browser/host_content_settings_map.cc
-2
components/content_settings/core/common/content_settings.h
-1
tools/metrics/actions/actions.xml
-1
expand_less