Make content settings map updates live.

chrome/browser/cocoa/content_exceptions_window_controller.mm

 // 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.
 
 #import "chrome/browser/cocoa/content_exceptions_window_controller.h"
 
 #include "app/l10n_util_mac.h"
 #include "app/table_model_observer.h"
 #import "base/mac_util.h"
 #import "base/scoped_nsobject.h"
@@ skipping 48 matching lines @@
   return NO;
 }
 
 - (NSAttributedString*)attributedStringForObjectValue:(id)object
                                 withDefaultAttributes:(NSDictionary*)attribs {
   return nil;
 }
 @end
 
 ////////////////////////////////////////////////////////////////////////////////
-// UpdatingContentSettingsObserver
+// ContentExceptionObserverBridge
+
+// Observer for the content settings table model.
+class ContentExceptionsTableModelObserver : public TableModelObserver {
+ public:
+  ContentExceptionsTableModelObserver(
+      ContentExceptionsWindowController* controller)
+      : controller_(controller) {}
+  virtual ~ContentExceptionsTableModelObserver() {}
+
+  virtual void OnModelChanged() {
+    [controller_ modelDidChange];
+  }
+  virtual void OnItemsChanged(int start, int length) {
+    [controller_ modelDidChange];
+  }
+  virtual void OnItemsAdded(int start, int length) {
+    [controller_ modelDidChange];
+  }
+  virtual void OnItemsRemoved(int start, int length) {
+    [controller_ modelDidChange];
+  }
+
+ private:
+  ContentExceptionsWindowController* controller_;  // weak
+};
 
 // UpdatingContentSettingsObserver is a notification observer that tells a
 // window controller to update its data on every notification.
 class UpdatingContentSettingsObserver : public NotificationObserver {
  public:
   UpdatingContentSettingsObserver(ContentExceptionsWindowController* controller)
       : controller_(controller) {
     // One would think one could register a TableModelObserver to be notified of
     // changes to ContentExceptionsTableModel. One would be wrong: The table
     // model only sends out changes that are made through the model, not for
@@ skipping 76 matching lines @@
 - (id)initWithType:(ContentSettingsType)settingsType
        settingsMap:(HostContentSettingsMap*)settingsMap {
   NSString* nibpath =
       [mac_util::MainAppBundle() pathForResource:@"ContentExceptionsWindow"
                                           ofType:@"nib"];
   if ((self = [super initWithWindowNibPath:nibpath owner:self])) {
     settingsType_ = settingsType;
     settingsMap_ = settingsMap;
     model_.reset(new ContentExceptionsTableModel(settingsMap_, settingsType_));
     showAsk_ = settingsType_ == CONTENT_SETTINGS_TYPE_COOKIES;
-    tableObserver_.reset(new UpdatingContentSettingsObserver(self));
+    tableObserver_.reset(new ContentExceptionsTableModelObserver(self));
+    model_->SetObserver(tableObserver_.get());
     updatesEnabled_ = YES;
 
     // TODO(thakis): autoremember window rect.
     // TODO(thakis): sorting support.
   }
   return self;
 }
 
 - (void)awakeFromNib {
   DCHECK([self window]);
@@ skipping 246 matching lines @@
 
 // This method appropriately sets the enabled states on the table's editing
 // buttons.
 - (void)adjustEditingButtons {
   NSIndexSet* selection = [tableView_ selectedRowIndexes];
   [removeButton_ setEnabled:([selection count] > 0)];
   [removeAllButton_ setEnabled:([tableView_ numberOfRows] > 0)];
 }
 
 - (void)modelDidChange {
+// XXX: disable editing mode if active. write test for that.
+
   // Some calls on |model_|, e.g. RemoveException(), change something on the
   // backing content settings map object (which sends a notification) and then
   // change more stuff in |model_|. If |model_| is deleted when the notification
   // is sent, this second access causes a segmentation violation. Hence, disable
   // resetting |model_| while updates can be in progress.
   if (!updatesEnabled_)
     return;
 
-  // The model caches its data, meaning we need to recreate it on every change.
-  model_.reset(new ContentExceptionsTableModel(settingsMap_, settingsType_));
-
   [tableView_ reloadData];
   [self adjustEditingButtons];
 }
 
 - (size_t)menuItemCount {
   return showAsk_ ? arraysize(kAskSettings) : arraysize(kNoAskSettings);
 }
 
 - (NSString*)titleForIndex:(size_t)index {
   switch ([self settingForIndex:index]) {
@@ skipping 16 matching lines @@
 - (size_t)indexForSetting:(ContentSetting)setting {
   for (size_t i = 0; i < [self menuItemCount]; ++i) {
     if ([self settingForIndex:i] == setting)
       return i;
   }
   NOTREACHED();
   return 0;
 }
 
 @end