| 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 ede76f7a395cbaffb1b0f5d2b4ec060d56ce2241..98af089dd7d4f3e32046303373d2f099cc35ba38 100644
|
| --- a/chrome/browser/cocoa/content_exceptions_window_controller.h
|
| +++ b/chrome/browser/cocoa/content_exceptions_window_controller.h
|
| @@ -10,6 +10,7 @@
|
| #include "chrome/common/content_settings_types.h"
|
|
|
| class ContentExceptionsTableModel;
|
| +class ContentSettingComboModel;
|
| class UpdatingContentSettingsObserver;
|
|
|
| // Controller for the content exception dialogs.
|
| @@ -28,9 +29,7 @@ class UpdatingContentSettingsObserver;
|
| HostContentSettingsMap* settingsMap_; // weak
|
| HostContentSettingsMap* otrSettingsMap_; // weak
|
| scoped_ptr<ContentExceptionsTableModel> model_;
|
| -
|
| - // Is set if "Session" should be a valid option in the "action" popup.
|
| - BOOL showSession_;
|
| + scoped_ptr<ContentSettingComboModel> popup_model_;
|
|
|
| // Is set if adding and editing exceptions for the current OTR session should
|
| // be allowed.
|
|
|