| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #import <Cocoa/Cocoa.h> | 5 #import <Cocoa/Cocoa.h> |
| 6 | 6 |
| 7 #include "base/cocoa_protocols_mac.h" | 7 #include "base/cocoa_protocols_mac.h" |
| 8 #include "base/scoped_ptr.h" | 8 #include "base/scoped_ptr.h" |
| 9 #include "chrome/browser/host_content_settings_map.h" | 9 #include "chrome/browser/host_content_settings_map.h" |
| 10 #include "chrome/common/content_settings_types.h" | 10 #include "chrome/common/content_settings_types.h" |
| (...skipping 14 matching lines...) Expand all Loading... |
| 25 IBOutlet NSButton* doneButton_; | 25 IBOutlet NSButton* doneButton_; |
| 26 | 26 |
| 27 ContentSettingsType settingsType_; | 27 ContentSettingsType settingsType_; |
| 28 HostContentSettingsMap* settingsMap_; // weak | 28 HostContentSettingsMap* settingsMap_; // weak |
| 29 HostContentSettingsMap* otrSettingsMap_; // weak | 29 HostContentSettingsMap* otrSettingsMap_; // weak |
| 30 scoped_ptr<ContentExceptionsTableModel> model_; | 30 scoped_ptr<ContentExceptionsTableModel> model_; |
| 31 | 31 |
| 32 // Is set if "Session" should be a valid option in the "action" popup. | 32 // Is set if "Session" should be a valid option in the "action" popup. |
| 33 BOOL showSession_; | 33 BOOL showSession_; |
| 34 | 34 |
| 35 // Is set if the cookie prompt should be disabled. | |
| 36 BOOL disableCookiePrompt_; | |
| 37 | |
| 38 // Is set if adding and editing exceptions for the current OTR session should | 35 // Is set if adding and editing exceptions for the current OTR session should |
| 39 // be allowed. | 36 // be allowed. |
| 40 BOOL otrAllowed_; | 37 BOOL otrAllowed_; |
| 41 | 38 |
| 42 // Listens for changes to the content settings and reloads the data when they | 39 // Listens for changes to the content settings and reloads the data when they |
| 43 // change. See comment in -modelDidChange in the mm file for details. | 40 // change. See comment in -modelDidChange in the mm file for details. |
| 44 scoped_ptr<UpdatingContentSettingsObserver> tableObserver_; | 41 scoped_ptr<UpdatingContentSettingsObserver> tableObserver_; |
| 45 | 42 |
| 46 // If this is set to NO, notifications by |tableObserver_| are ignored. This | 43 // If this is set to NO, notifications by |tableObserver_| are ignored. This |
| 47 // is used to suppress updates at bad times. | 44 // is used to suppress updates at bad times. |
| (...skipping 21 matching lines...) Expand all Loading... |
| 69 - (IBAction)removeAllExceptions:(id)sender; | 66 - (IBAction)removeAllExceptions:(id)sender; |
| 70 // Closes the sheet and ends the modal loop. | 67 // Closes the sheet and ends the modal loop. |
| 71 - (IBAction)closeSheet:(id)sender; | 68 - (IBAction)closeSheet:(id)sender; |
| 72 | 69 |
| 73 @end | 70 @end |
| 74 | 71 |
| 75 @interface ContentExceptionsWindowController(VisibleForTesting) | 72 @interface ContentExceptionsWindowController(VisibleForTesting) |
| 76 - (void)cancel:(id)sender; | 73 - (void)cancel:(id)sender; |
| 77 - (BOOL)editingNewException; | 74 - (BOOL)editingNewException; |
| 78 @end | 75 @end |
| OLD | NEW |