Reintegrate 552 r66225-r66645....

chrome/browser/cocoa/content_exceptions_window_controller.h

 // 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 <Cocoa/Cocoa.h>
 
 #include "base/cocoa_protocols_mac.h"
 #include "base/scoped_ptr.h"
 #include "chrome/browser/host_content_settings_map.h"
 #include "chrome/common/content_settings_types.h"
 
 class ContentExceptionsTableModel;
+class ContentSettingComboModel;
 class UpdatingContentSettingsObserver;
 
 // Controller for the content exception dialogs.
 @interface ContentExceptionsWindowController : NSWindowController
                                                <NSWindowDelegate,
                                                 NSTableViewDataSource,
                                                 NSTableViewDelegate> {
  @private
   IBOutlet NSTableView* tableView_;
   IBOutlet NSButton* addButton_;
   IBOutlet NSButton* removeButton_;
   IBOutlet NSButton* removeAllButton_;
   IBOutlet NSButton* doneButton_;
 
   ContentSettingsType settingsType_;
   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.
   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_;
 
   // If this is set to NO, notifications by |tableObserver_| are ignored. This
@@ skipping 22 matching lines @@
 - (IBAction)removeAllExceptions:(id)sender;
 // Closes the sheet and ends the modal loop.
 - (IBAction)closeSheet:(id)sender;
 
 @end
 
 @interface ContentExceptionsWindowController(VisibleForTesting)
 - (void)cancel:(id)sender;
 - (BOOL)editingNewException;
 @end