Display content settings applying to the current otr session only.

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"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/content_exceptions_table_model.h"
 #include "chrome/common/notification_registrar.h"
 #include "chrome/common/notification_service.h"
 #include "grit/generated_resources.h"
 #include "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h"
 
 @interface ContentExceptionsWindowController (Private)
 - (id)initWithType:(ContentSettingsType)settingsType
-       settingsMap:(HostContentSettingsMap*)settingsMap;
+       settingsMap:(HostContentSettingsMap*)settingsMap
+    otrSettingsMap:(HostContentSettingsMap*)otrSettingsMap;
 - (void)updateRow:(NSInteger)row
-        withEntry:(const HostContentSettingsMap::PatternSettingPair&)entry;
+        withEntry:(const HostContentSettingsMap::PatternSettingPair&)entry
+           forOtr:(BOOL)isOtr;
 - (void)adjustEditingButtons;
 - (void)modelDidChange;
 - (size_t)menuItemCount;
 - (NSString*)titleForIndex:(size_t)index;
 - (ContentSetting)settingForIndex:(size_t)index;
 - (size_t)indexForSetting:(ContentSetting)setting;
 @end
 
 ////////////////////////////////////////////////////////////////////////////////
 // PatternFormatter
@@ skipping 101 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // ContentExceptionsWindowController implementation
 
 static ContentExceptionsWindowController*
     g_exceptionWindows[CONTENT_SETTINGS_NUM_TYPES] = { nil };
 
 @implementation ContentExceptionsWindowController
 
 + (id)controllerForType:(ContentSettingsType)settingsType
-            settingsMap:(HostContentSettingsMap*)settingsMap {
+            settingsMap:(HostContentSettingsMap*)settingsMap
+         otrSettingsMap:(HostContentSettingsMap*)otrSettingsMap {
   if (!g_exceptionWindows[settingsType]) {
     g_exceptionWindows[settingsType] =
-        [[ContentExceptionsWindowController alloc] initWithType:settingsType
-                                                    settingsMap:settingsMap];
+        [[ContentExceptionsWindowController alloc]
+            initWithType:settingsType
+             settingsMap:settingsMap
+          otrSettingsMap:otrSettingsMap];
   }
   return g_exceptionWindows[settingsType];
 }
 
 - (id)initWithType:(ContentSettingsType)settingsType
-       settingsMap:(HostContentSettingsMap*)settingsMap {
+       settingsMap:(HostContentSettingsMap*)settingsMap
+    otrSettingsMap:(HostContentSettingsMap*)otrSettingsMap {
   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_));
+    otrSettingsMap_ = otrSettingsMap;
+    model_.reset(new ContentExceptionsTableModel(
+        settingsMap_, otrSettingsMap_, settingsType_));
     showAsk_ = settingsType_ == CONTENT_SETTINGS_TYPE_COOKIES;
+    otrAllowed_ = otrSettingsMap != NULL;
     tableObserver_.reset(new UpdatingContentSettingsObserver(self));
     updatesEnabled_ = YES;
 
     // TODO(thakis): autoremember window rect.
     // TODO(thakis): sorting support.
   }
   return self;
 }
 
 - (void)awakeFromNib {
@@ skipping 19 matching lines @@
     [allowItem.get() setTag:[self settingForIndex:i]];
     [menu.get() addItem:allowItem.get()];
   }
   NSCell* menuCell =
       [[tableView_ tableColumnWithIdentifier:@"action"] dataCell];
   [menuCell setMenu:menu.get()];
 
   NSCell* patternCell =
       [[tableView_ tableColumnWithIdentifier:@"pattern"] dataCell];
   [patternCell setFormatter:[[[PatternFormatter alloc] init] autorelease]];
+
+  if (!otrAllowed_) {
+    [tableView_
+        removeTableColumn:[tableView_ tableColumnWithIdentifier:@"otr"]];
+  }
 }
 
 - (void)setMinWidth:(CGFloat)minWidth {
   NSWindow* window = [self window];
   [window setMinSize:NSMakeSize(minWidth, [window minSize].height)];
   if ([window frame].size.width < minWidth) {
     NSRect frame = [window frame];
     frame.size.width = minWidth;
     [window setFrame:frame display:NO];
   }
@@ skipping 120 matching lines @@
 // Table View Data Source -----------------------------------------------------
 
 - (NSInteger)numberOfRowsInTableView:(NSTableView*)table {
   return model_->RowCount() + (newException_.get() ? 1 : 0);
 }
 
 - (id)tableView:(NSTableView*)tv
     objectValueForTableColumn:(NSTableColumn*)tableColumn
                           row:(NSInteger)row {
   const HostContentSettingsMap::PatternSettingPair* entry;
-  if (newException_.get() && row >= model_->RowCount())
+  int isOtr;
+  if (newException_.get() && row >= model_->RowCount()) {
     entry = newException_.get();
-  else
+    isOtr = 0;
+  } else {
     entry = &model_->entry_at(row);
+    isOtr = model_->entry_is_off_the_record(row) ? 1 : 0;
+  }
 
   NSObject* result = nil;
   NSString* identifier = [tableColumn identifier];
   if ([identifier isEqualToString:@"pattern"]) {
     result = base::SysUTF8ToNSString(entry->first.AsString());
   } else if ([identifier isEqualToString:@"action"]) {
     result = [NSNumber numberWithInt:[self indexForSetting:entry->second]];
+  } else if ([identifier isEqualToString:@"otr"]) {
+    result = [NSNumber numberWithInt:isOtr];
   } else {
     NOTREACHED();
   }
   return result;
 }
 
 // Updates exception at |row| to contain the data in |entry|.
 - (void)updateRow:(NSInteger)row
-        withEntry:(const HostContentSettingsMap::PatternSettingPair&)entry {
+        withEntry:(const HostContentSettingsMap::PatternSettingPair&)entry
+           forOtr:(BOOL)isOtr {
   // TODO(thakis): This apparently moves an edited row to the back of the list.
   // It's what windows and linux do, but it's kinda sucky. Fix.
   // http://crbug.com/36904
   updatesEnabled_ = NO;
   if (row < model_->RowCount())
     model_->RemoveException(row);
-  model_->AddException(entry.first, entry.second);
+  model_->AddException(entry.first, entry.second, isOtr);
   updatesEnabled_ = YES;
   [self modelDidChange];
 
   // For now, at least re-select the edited element.
-  int newIndex = model_->IndexOfExceptionByPattern(entry.first);
+  int newIndex = model_->IndexOfExceptionByPattern(entry.first, isOtr);
   DCHECK(newIndex != -1);
   [tableView_ selectRowIndexes:[NSIndexSet indexSetWithIndex:newIndex]
           byExtendingSelection:NO];
 }
 
 - (void) tableView:(NSTableView*)tv
     setObjectValue:(id)object
     forTableColumn:(NSTableColumn*)tableColumn
                row:(NSInteger)row {
   // -remove: and -removeAll: both call |tableView_|'s -deselectAll:, which
   // calls this method if a cell is currently being edited. Do not commit edits
   // of rows that are about to be deleted.
   if (!updatesEnabled_) {
     // If this method gets called, the pattern filed of the new exception can no
     // longer be being edited. Reset |newException_| to keep the invariant true.
     newException_.reset();
     return;
   }
 
   // Get model object.
   bool isNewRow = newException_.get() && row >= model_->RowCount();
   HostContentSettingsMap::PatternSettingPair originalEntry =
       isNewRow ? *newException_ : model_->entry_at(row);
   HostContentSettingsMap::PatternSettingPair entry = originalEntry;
+  bool isOtr =
+      isNewRow ? 0 : model_->entry_is_off_the_record(row);
+  bool wasOtr = isOtr;
 
   // Modify it.
   NSString* identifier = [tableColumn identifier];
   if ([identifier isEqualToString:@"pattern"]) {
     entry.first = HostContentSettingsMap::Pattern(
                       base::SysNSStringToUTF8(object));
   }
   if ([identifier isEqualToString:@"action"]) {
     int index = [object intValue];
     entry.second = [self settingForIndex:index];
   }
+  if ([identifier isEqualToString:@"otr"]) {
+    isOtr = [object intValue] != 0;
+  }
 
   // Commit modification, if any.
   if (isNewRow) {
     newException_.reset();
     if (![identifier isEqualToString:@"pattern"]) {
       [tableView_ reloadData];
       [self adjustEditingButtons];
       return;  // Commit new rows only when the pattern has been set.
     }
-    int newIndex = model_->IndexOfExceptionByPattern(entry.first);
+    int newIndex = model_->IndexOfExceptionByPattern(entry.first, false);
     if (newIndex != -1) {
       // The new pattern was already in the table. Focus existing row instead of
       // overwriting it with a new one.
       [tableView_ selectRowIndexes:[NSIndexSet indexSetWithIndex:newIndex]
               byExtendingSelection:NO];
       [tableView_ reloadData];
       [self adjustEditingButtons];
       return;
     }
   }
-  if (entry != originalEntry || isNewRow)
-    [self updateRow:row withEntry:entry];
+  if (entry != originalEntry || wasOtr != isOtr || isNewRow)
+    [self updateRow:row withEntry:entry forOtr:isOtr];
 }
 
 
 // Table View Delegate --------------------------------------------------------
 
 // When the selection in the table view changes, we need to adjust buttons.
 - (void)tableViewSelectionDidChange:(NSNotification*)notification {
   [self adjustEditingButtons];
 }
 
@@ skipping 10 matching lines @@
 - (void)modelDidChange {
   // 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_));
+  model_.reset(new ContentExceptionsTableModel(
+      settingsMap_, otrSettingsMap_, settingsType_));
 
   [tableView_ reloadData];
   [self adjustEditingButtons];
 }
 
 - (size_t)menuItemCount {
   return showAsk_ ? arraysize(kAskSettings) : arraysize(kNoAskSettings);
 }
 
 - (NSString*)titleForIndex:(size_t)index {
@@ skipping 17 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