[Mac] Add per-plugin exceptions to content settings.

chrome/browser/plugin_exceptions_table_model.cc

 // Copyright (c) 2010 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 "app/l10n_util.h"
 #include "app/table_model_observer.h"
 #include "base/auto_reset.h"
 #include "base/sys_string_conversions.h"
@@ skipping 16 matching lines @@
 bool PluginExceptionsTableModel::CanRemoveRows(const Rows& rows) const {
   return !rows.empty();
 }
 
 void PluginExceptionsTableModel::RemoveRows(const Rows& rows) {
   AutoReset<bool> tmp(&updates_disabled_, true);
   bool reload_all = false;
   // Iterate in reverse over the rows to get the indexes right.
   for (Rows::const_reverse_iterator it = rows.rbegin();
        it != rows.rend(); ++it) {
+    DCHECK_LT(*it, settings_.size());
     SettingsEntry& entry = settings_[*it];
     HostContentSettingsMap* map = entry.is_otr ? otr_map_ : map_;
     map->SetContentSetting(entry.pattern,
                            CONTENT_SETTINGS_TYPE_PLUGINS,
                            resources_[entry.plugin_id],
                            CONTENT_SETTING_DEFAULT);
     row_counts_[entry.plugin_id]--;
     // If we remove the last exception for a plugin, recreate all groups to get
     // correct IDs.
     if (row_counts_[entry.plugin_id] == 0)
       reload_all = true;
     settings_.erase(settings_.begin() + *it);
   }
   if (reload_all) {
     // This also notifies the observer.
     ReloadSettings();
   } else if (observer_) {
     for (Rows::const_reverse_iterator it = rows.rbegin();
          it != rows.rend(); ++it) {
       observer_->OnItemsRemoved(*it, 1);
     }
   }
 }
 
 void PluginExceptionsTableModel::RemoveAll() {
-  int old_row_count = RowCount();
-  {
-    AutoReset<bool> tmp(&updates_disabled_, true);
-    map_->ClearSettingsForOneType(CONTENT_SETTINGS_TYPE_PLUGINS);
-    if (otr_map_)
-      otr_map_->ClearSettingsForOneType(CONTENT_SETTINGS_TYPE_PLUGINS);
-  }
+  AutoReset<bool> tmp(&updates_disabled_, true);
+  map_->ClearSettingsForOneType(CONTENT_SETTINGS_TYPE_PLUGINS);
+  if (otr_map_)
+    otr_map_->ClearSettingsForOneType(CONTENT_SETTINGS_TYPE_PLUGINS);
+
   ClearSettings();
   if (observer_)
-    observer_->OnItemsRemoved(0, old_row_count);
+    observer_->OnModelChanged();
 }
 
 int PluginExceptionsTableModel::RowCount() {
   return settings_.size();
 }
 
 std::wstring PluginExceptionsTableModel::GetText(int row, int column_id) {
   DCHECK_GE(row, 0);
   DCHECK_LT(row, static_cast<int>(settings_.size()));
   SettingsEntry& entry = settings_[row];
@@ skipping 106 matching lines @@
 }
 
 void PluginExceptionsTableModel::ReloadSettings() {
   ClearSettings();
   LoadSettings();
 
   if (observer_)
     observer_->OnModelChanged();
 }