Index: chrome/browser/plugins/plugin_info_message_filter.cc |
diff --git a/chrome/browser/plugins/plugin_info_message_filter.cc b/chrome/browser/plugins/plugin_info_message_filter.cc |
index 065b2519c42894a0149589029597a794c19e482a..301d2952d6775db9bf316753e0088ff97b5387e7 100644 |
--- a/chrome/browser/plugins/plugin_info_message_filter.cc |
+++ b/chrome/browser/plugins/plugin_info_message_filter.cc |
@@ -418,8 +418,9 @@ void PluginInfoMessageFilter::Context::DecidePluginStatus( |
if (plugin_setting == CONTENT_SETTING_DETECT_IMPORTANT_CONTENT) { |
status->value = |
ChromeViewHostMsg_GetPluginInfo_Status::kPlayImportantContent; |
- } else if (plugin_setting == CONTENT_SETTING_BLOCK || |
- plugin_setting == CONTENT_SETTING_ASK) { |
+ } else if (plugin_setting == CONTENT_SETTING_ASK) { |
+ status->value = ChromeViewHostMsg_GetPluginInfo_Status::kClickToPlay; |
+ } else if (plugin_setting == CONTENT_SETTING_BLOCK) { |
status->value = |
is_managed ? ChromeViewHostMsg_GetPluginInfo_Status::kBlockedByPolicy |
: ChromeViewHostMsg_GetPluginInfo_Status::kBlocked; |
@@ -548,6 +549,7 @@ void PluginInfoMessageFilter::Context::MaybeGrantAccess( |
const ChromeViewHostMsg_GetPluginInfo_Status& status, |
const base::FilePath& path) const { |
if (status.value == ChromeViewHostMsg_GetPluginInfo_Status::kAllowed || |
+ status.value == ChromeViewHostMsg_GetPluginInfo_Status::kClickToPlay || |
status.value == |
ChromeViewHostMsg_GetPluginInfo_Status::kPlayImportantContent) { |
ChromePluginServiceFilter::GetInstance()->AuthorizePlugin( |