Display content settings applying to the current otr session only.

chrome/browser/cocoa/content_exceptions_window_controller.h

Index: chrome/browser/cocoa/content_exceptions_window_controller.h
diff --git a/chrome/browser/cocoa/content_exceptions_window_controller.h b/chrome/browser/cocoa/content_exceptions_window_controller.h
index 1d1bc2a7f7073daebd0f399c728359badf7d3dab..131cf72f27d96647155cc26366296369fb37f829 100644
--- a/chrome/browser/cocoa/content_exceptions_window_controller.h
+++ b/chrome/browser/cocoa/content_exceptions_window_controller.h
@@ -28,11 +28,16 @@ class UpdatingContentSettingsObserver;
 
   ContentSettingsType settingsType_;
   HostContentSettingsMap* settingsMap_;  // weak
+  HostContentSettingsMap* otrSettingsMap_;  // weak
   scoped_ptr<ContentExceptionsTableModel> model_;
 
   // Is set if "Ask" should be a valid option in the "action" popup.
   BOOL showAsk_;
 
+  // Is set if adding and editing exceptions for the current OTR session should
+  // be allowed.
+  BOOL otrAllowed_;
+
   // Listens for changes to the content settings and reloads the data when they
   // change. See comment in -modelDidChange in the mm file for details.
   scoped_ptr<UpdatingContentSettingsObserver> tableObserver_;
@@ -49,7 +54,8 @@ class UpdatingContentSettingsObserver;
 // Returns the content exceptions window controller for |settingsType|.
 // Changes made by the user in the window are persisted in |settingsMap|.
 + (id)controllerForType:(ContentSettingsType)settingsType
-            settingsMap:(HostContentSettingsMap*)settingsMap;
+            settingsMap:(HostContentSettingsMap*)settingsMap
+         otrSettingsMap:(HostContentSettingsMap*)otrSettingsMap;
 
 // Shows the exceptions dialog as a modal sheet attached to |window|.
 - (void)attachSheetTo:(NSWindow*)window;