Delegating the "are images allowed" decision to renderer.

chrome/browser/plugin_exceptions_table_model.cc

 // Copyright (c) 2011 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/plugin_exceptions_table_model.h"
 
 #include "base/auto_reset.h"
 #include "base/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/common/chrome_notification_types.h"
+#include "chrome/browser/content_settings/content_settings_provider.h"
 #include "content/common/notification_service.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/table_model_observer.h"
 
 PluginExceptionsTableModel::PluginExceptionsTableModel(
     HostContentSettingsMap* content_settings_map,
     HostContentSettingsMap* otr_content_settings_map)
     : map_(content_settings_map),
       otr_map_(otr_content_settings_map),
@@ skipping 120 matching lines @@
     std::vector<webkit::npapi::PluginGroup>* plugin_groups) {
   webkit::npapi::PluginList::Singleton()->GetPluginGroups(false, plugin_groups);
 }
 
 void PluginExceptionsTableModel::LoadSettings() {
   int group_id = 0;
   std::vector<webkit::npapi::PluginGroup> plugins;
   GetPlugins(&plugins);
   for (size_t i = 0; i < plugins.size(); ++i) {
     std::string plugin = plugins[i].identifier();
-    HostContentSettingsMap::SettingsForOneType settings;
-    map_->GetSettingsForOneType(CONTENT_SETTINGS_TYPE_PLUGINS,
-                                plugin,
-                                &settings);
-    HostContentSettingsMap::SettingsForOneType otr_settings;
+    ContentSettingsForOneType settings;
+    map_->GetSettingsForOneType(
+        CONTENT_SETTINGS_TYPE_PLUGINS,
+        plugin,
+        content_settings::ProviderInterface::Rule::LexicographicalSort,
+        &settings);
+    ContentSettingsForOneType otr_settings;
     if (otr_map_) {
-      otr_map_->GetSettingsForOneType(CONTENT_SETTINGS_TYPE_PLUGINS,
-                                      plugin,
-                                      &otr_settings);
+      otr_map_->GetSettingsForOneType(
+          CONTENT_SETTINGS_TYPE_PLUGINS,
+          plugin,
+          content_settings::ProviderInterface::Rule::LexicographicalSort,
+          &otr_settings);
     }
     string16 title = plugins[i].GetGroupName();
-    for (HostContentSettingsMap::SettingsForOneType::iterator setting_it =
+    for (ContentSettingsForOneType::iterator setting_it =
              settings.begin();
          setting_it != settings.end(); ++setting_it) {
       SettingsEntry entry = {
         setting_it->a,
         group_id,
         setting_it->c,
         false
       };
       settings_.push_back(entry);
     }
-    for (HostContentSettingsMap::SettingsForOneType::iterator setting_it =
+    for (ContentSettingsForOneType::iterator setting_it =
              otr_settings.begin();
          setting_it != otr_settings.end(); ++setting_it) {
       SettingsEntry entry = {
         setting_it->a,
         group_id,
         setting_it->c,
         true
       };
       settings_.push_back(entry);
     }
     int num_plugins = settings.size() + otr_settings.size();
     if (num_plugins > 0) {
       Group group = { title, group_id++ };
       groups_.push_back(group);
       resources_.push_back(plugin);
       row_counts_.push_back(num_plugins);
     }
   }
 }
 
 void PluginExceptionsTableModel::ReloadSettings() {
   ClearSettings();
   LoadSettings();
 
   if (observer_)
     observer_->OnModelChanged();
 }