Disable "always allowed" checkbox in chrome://plugins for disabled plug-ins.

chrome/browser/ui/webui/plugins_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/webui/plugins_ui.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 324 matching lines @@
   PluginService::GetInstance()->GetPluginGroups(
       base::Bind(&PluginsDOMHandler::PluginsLoaded,
           weak_ptr_factory_.GetWeakPtr(), plugin_finder));
 }
 
 void PluginsDOMHandler::PluginsLoaded(PluginFinder* plugin_finder,
                                       const std::vector<PluginGroup>& groups) {
   Profile* profile = Profile::FromWebUI(web_ui());
   PluginPrefs* plugin_prefs = PluginPrefs::GetForProfile(profile);
 
-  HostContentSettingsMap* map = profile->GetHostContentSettingsMap();
   ContentSettingsPattern wildcard = ContentSettingsPattern::Wildcard();
 
   // Construct DictionaryValues to return to the UI
   ListValue* plugin_groups_data = new ListValue();
   for (size_t i = 0; i < groups.size(); ++i) {
     const PluginGroup& group = groups[i];
     if (group.IsEmpty())
       continue;
     ListValue* plugin_files = new ListValue();
     string16 group_name = group.GetGroupName();
@@ skipping 85 matching lines @@
       enabled_mode = "enabledByPolicy";
     } else if (all_plugins_disabled_by_policy) {
       enabled_mode = "disabledByPolicy";
     } else if (group_enabled) {
       enabled_mode = "enabledByUser";
     } else {
       enabled_mode = "disabledByUser";
     }
     group_data->SetString("enabledMode", enabled_mode);
 
-    // TODO(bauerb): We should have a method on HostContentSettingsMap for this.
     bool always_allowed = false;
-    ContentSettingsForOneType settings;
-    map->GetSettingsForOneType(CONTENT_SETTINGS_TYPE_PLUGINS,
-                               group.identifier(), &settings);
-    for (ContentSettingsForOneType::const_iterator it = settings.begin();
-         it != settings.end(); ++it) {
-      if (it->primary_pattern == wildcard &&
-          it->secondary_pattern == wildcard &&
-          it->setting == CONTENT_SETTING_ALLOW) {
-        always_allowed = true;
-        break;
-      }
+    if (group_enabled) {
+      const DictionaryValue* whitelist = profile->GetPrefs()->GetDictionary(
+          prefs::kContentSettingsPluginWhitelist);
+      whitelist->GetBoolean(group.identifier(), &always_allowed);
     }
     group_data->SetBoolean("alwaysAllowed", always_allowed);
 
     plugin_groups_data->Append(group_data);
   }
   DictionaryValue results;
   results.Set("plugins", plugin_groups_data);
   web_ui()->CallJavascriptFunction("returnPluginsData", results);
 }
 
@@ skipping 24 matching lines @@
 void PluginsUI::RegisterUserPrefs(PrefService* prefs) {
   prefs->RegisterBooleanPref(prefs::kPluginsShowDetails,
                              false,
                              PrefService::UNSYNCABLE_PREF);
   prefs->RegisterBooleanPref(prefs::kPluginsShowSetReaderDefaultInfobar,
                              true,
                              PrefService::UNSYNCABLE_PREF);
   prefs->RegisterDictionaryPref(prefs::kContentSettingsPluginWhitelist,
                                 PrefService::SYNCABLE_PREF);
 }