Plugin Power Saver: Fix DETECT in WebsiteSettingsUI omnibox dropdown.

chrome/browser/ui/website_settings/website_settings_ui.cc

Index: chrome/browser/ui/website_settings/website_settings_ui.cc
diff --git a/chrome/browser/ui/website_settings/website_settings_ui.cc b/chrome/browser/ui/website_settings/website_settings_ui.cc
index 2591d6e16b072f33cf5f66ce917102f1f9c1f069..9ee7e692f86966d2adf11a2e0a70c19c15cbb360 100644
--- a/chrome/browser/ui/website_settings/website_settings_ui.cc
+++ b/chrome/browser/ui/website_settings/website_settings_ui.cc
@@ -50,7 +50,7 @@ const int kPermissionButtonTextIDUserManaged[] = {
     IDS_WEBSITE_SETTINGS_BUTTON_TEXT_BLOCKED_BY_USER,
     IDS_WEBSITE_SETTINGS_BUTTON_TEXT_ASK_BY_USER,
     kInvalidResourceID,
-    kInvalidResourceID};
+    IDS_WEBSITE_SETTINGS_BUTTON_TEXT_DETECT_IMPORTANT_CONTENT_BY_USER};
 static_assert(arraysize(kPermissionButtonTextIDUserManaged) ==
               CONTENT_SETTING_NUM_SETTINGS,
               "kPermissionButtonTextIDUserManaged array size is incorrect");
@@ -157,13 +157,21 @@ base::string16 WebsiteSettingsUI::PermissionValueToUIString(
 
 // static
 base::string16 WebsiteSettingsUI::PermissionActionToUIString(
-      ContentSetting setting,
-      ContentSetting default_setting,
-      content_settings::SettingSource source) {
+    ContentSettingsType type,
+    ContentSetting setting,
+    ContentSetting default_setting,
+    content_settings::SettingSource source) {
   ContentSetting effective_setting = setting;
-  if (effective_setting == CONTENT_SETTING_DEFAULT)
+  if (effective_setting == CONTENT_SETTING_DEFAULT) {
     effective_setting = default_setting;
 
+    // For Plugins, ASK is obsolete. Show as BLOCK to reflect actual behavior.
+    if (type == CONTENT_SETTINGS_TYPE_PLUGINS &&
+        default_setting == CONTENT_SETTING_ASK) {
+      effective_setting = CONTENT_SETTING_BLOCK;
+    }
+  }
+
   const int* button_text_ids = NULL;
   switch (source) {
     case content_settings::SETTING_SOURCE_USER: