Plugin Power Saver: Fix DETECT in WebsiteSettingsUI omnibox dropdown.

chrome/browser/ui/website_settings/website_settings_ui.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/website_settings/website_settings_ui.h"
 
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
@@ skipping 32 matching lines @@
               "incorrect");
 
 // The resource id's for the strings that are displayed on the permissions
 // button if the permission setting is managed by the user.
 const int kPermissionButtonTextIDUserManaged[] = {
     kInvalidResourceID,
     IDS_WEBSITE_SETTINGS_BUTTON_TEXT_ALLOWED_BY_USER,
     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");
 
 // The resource id's for the strings that are displayed on the permissions
 // button if the permission setting is the global default setting.
 const int kPermissionButtonTextIDDefaultSetting[] = {
     kInvalidResourceID,
     IDS_WEBSITE_SETTINGS_BUTTON_TEXT_ALLOWED_BY_DEFAULT,
     IDS_WEBSITE_SETTINGS_BUTTON_TEXT_BLOCKED_BY_DEFAULT,
@@ skipping 86 matching lines @@
     case CONTENT_SETTING_ASK:
       return l10n_util::GetStringUTF16(IDS_WEBSITE_SETTINGS_PERMISSION_ASK);
     default:
       NOTREACHED();
       return base::string16();
   }
 }
 
 // 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:
       if (setting == CONTENT_SETTING_DEFAULT)
         button_text_ids = kPermissionButtonTextIDDefaultSetting;
       else
         button_text_ids = kPermissionButtonTextIDUserManaged;
       break;
     case content_settings::SETTING_SOURCE_POLICY:
       button_text_ids = kPermissionButtonTextIDPolicyManaged;
@@ skipping 157 matching lines @@
   // the first time.
   return IDR_PAGEINFO_INFO;
 }
 
 // static
 const gfx::Image& WebsiteSettingsUI::GetFirstVisitIcon(
     const base::string16& first_visit) {
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   return rb.GetNativeImageNamed(GetFirstVisitIconID(first_visit));
 }