Display content settings applying to the current otr session only.

chrome/browser/gtk/options/content_exceptions_window_gtk.h

Index: chrome/browser/gtk/options/content_exceptions_window_gtk.h
diff --git a/chrome/browser/gtk/options/content_exceptions_window_gtk.h b/chrome/browser/gtk/options/content_exceptions_window_gtk.h
index c415419ec2a2bf92d9874f84722ff7390252f6ca..aadd3adfa61e98ceaab1935dfed01d6d169e3761 100644
--- a/chrome/browser/gtk/options/content_exceptions_window_gtk.h
+++ b/chrome/browser/gtk/options/content_exceptions_window_gtk.h
@@ -26,6 +26,7 @@ class ContentExceptionsWindowGtk : public gtk_tree::TableAdapter::Delegate,
  public:
   static void ShowExceptionsWindow(GtkWindow* window,
                                    HostContentSettingsMap* map,
+                                   HostContentSettingsMap* off_the_record_map,
                                    ContentSettingsType content_type);
 
   ~ContentExceptionsWindowGtk();
@@ -37,6 +38,7 @@ class ContentExceptionsWindowGtk : public gtk_tree::TableAdapter::Delegate,
   virtual void AcceptExceptionEdit(
       const HostContentSettingsMap::Pattern& pattern,
       ContentSetting setting,
+      bool is_off_the_record,
       int index,
       bool is_new);
 
@@ -45,11 +47,13 @@ class ContentExceptionsWindowGtk : public gtk_tree::TableAdapter::Delegate,
   enum {
     COL_PATTERN,
     COL_ACTION,
+    COL_OTR,
     COL_COUNT
   };
 
   ContentExceptionsWindowGtk(GtkWindow* parent,
                              HostContentSettingsMap* map,
+                             HostContentSettingsMap* off_the_record_map,
                              ContentSettingsType type);
 
   // Updates which buttons are enabled.
@@ -79,6 +83,9 @@ class ContentExceptionsWindowGtk : public gtk_tree::TableAdapter::Delegate,
   // gold standard data.
   scoped_ptr<ContentExceptionsTableModel> model_;
 
+  // True if we also show exceptions from an OTR profile.
+  bool allow_off_the_record_;
+
   // The adapter that ferries data back and forth between |model_| and
   // |list_store_| whenever either of them change.
   scoped_ptr<gtk_tree::TableAdapter> model_adapter_;