Reintegrate 552 r66225-r66645....

chrome/browser/cocoa/content_exceptions_window_controller.h

Index: chrome/browser/cocoa/content_exceptions_window_controller.h
===================================================================
--- chrome/browser/cocoa/content_exceptions_window_controller.h	(revision 66837)
+++ chrome/browser/cocoa/content_exceptions_window_controller.h	(working copy)
@@ -10,6 +10,7 @@
 #include "chrome/common/content_settings_types.h"
 
 class ContentExceptionsTableModel;
+class ContentSettingComboModel;
 class UpdatingContentSettingsObserver;
 
 // Controller for the content exception dialogs.
@@ -28,10 +29,8 @@
   HostContentSettingsMap* settingsMap_;  // weak
   HostContentSettingsMap* otrSettingsMap_;  // weak
   scoped_ptr<ContentExceptionsTableModel> model_;
+  scoped_ptr<ContentSettingComboModel> popup_model_;
 
-  // Is set if "Session" should be a valid option in the "action" popup.
-  BOOL showSession_;
-
   // Is set if adding and editing exceptions for the current OTR session should
   // be allowed.
   BOOL otrAllowed_;