Display content settings applying to the current otr session only.

chrome/browser/cocoa/content_settings_dialog_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_settings_dialog_controller.h"
 
 #import <Cocoa/Cocoa.h>
 
 #include "app/l10n_util.h"
 #include "base/mac_util.h"
@@ skipping 315 matching lines @@
   GeolocationContentSettingsMap* settingsMap =
       profile_->GetGeolocationContentSettingsMap();
   GeolocationExceptionsTableModel* model =  // Freed by window controller.
       new GeolocationExceptionsTableModel(settingsMap);
   [[SimpleContentExceptionsWindowController controllerWithTableModel:model]
       attachSheetTo:[self window]];
 }
 
 - (void)showExceptionsForType:(ContentSettingsType)settingsType {
   HostContentSettingsMap* settingsMap = profile_->GetHostContentSettingsMap();
+  HostContentSettingsMap* offTheRecordSettingsMap =
+      profile_->HasOffTheRecordProfile() ?
+          profile_->GetOffTheRecordProfile()->GetHostContentSettingsMap() :
+          NULL;
   [[ContentExceptionsWindowController controllerForType:settingsType
-                                            settingsMap:settingsMap]
+                                            settingsMap:settingsMap
+                                         otrSettingsMap:offTheRecordSettingsMap]
       attachSheetTo:[self window]];
 }
 
 - (void)setImagesEnabledIndex:(NSInteger)value {
   ContentSetting setting = value == kContentSettingsEnabledIndex ?
       CONTENT_SETTING_ALLOW : CONTENT_SETTING_BLOCK;
   ContentSettingsDialogControllerInternal::PrefObserverDisabler
       disabler(observer_.get());
   profile_->GetHostContentSettingsMap()->SetDefaultContentSetting(
       CONTENT_SETTINGS_TYPE_IMAGES, setting);
@@ skipping 114 matching lines @@
     [self willChangeValueForKey:@"popupsEnabledIndex"];
     [self didChangeValueForKey:@"popupsEnabledIndex"];
   }
   if (*prefName == prefs::kGeolocationDefaultContentSetting) {
     [self willChangeValueForKey:@"geolocationSettingIndex"];
     [self didChangeValueForKey:@"geolocationSettingIndex"];
   }
 }
 
 @end