diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-06 02:06:15 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-06 02:06:15 +0000 |
| commit | 90e9d489b71ce25252d2a85412d3d82af8a58c17 (patch) | |
| tree | 85f67dda821a170a116a5c79260094a195bcf6d0 /chrome/browser/cocoa/content_exceptions_window_controller.h | |
| parent | fd170c4d9a633faad9c6b93193539114bfcfeada (diff) | |
| download | chromium_src-90e9d489b71ce25252d2a85412d3d82af8a58c17.zip chromium_src-90e9d489b71ce25252d2a85412d3d82af8a58c17.tar.gz chromium_src-90e9d489b71ce25252d2a85412d3d82af8a58c17.tar.bz2 | |
Mac: Fix another crash in content exceptions dialog.
Also add a couple unit tests. Also fix another potential crash and other problems uncovered by the tests.
BUG=37208
TEST=See bug. Also, unittests.
Review URL: http://codereview.chromium.org/668046
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40810 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa/content_exceptions_window_controller.h')
| -rw-r--r-- | chrome/browser/cocoa/content_exceptions_window_controller.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/chrome/browser/cocoa/content_exceptions_window_controller.h b/chrome/browser/cocoa/content_exceptions_window_controller.h index e7eab5e..a42510e0 100644 --- a/chrome/browser/cocoa/content_exceptions_window_controller.h +++ b/chrome/browser/cocoa/content_exceptions_window_controller.h @@ -40,7 +40,8 @@ class UpdatingContentSettingsObserver; // is used to suppress updates at bad times. BOOL updatesEnabled_; - // This is non-NULL only while a new element is being added. + // This is non-NULL only while a new element is being added and its host + // is being edited. scoped_ptr<HostContentSettingsMap::HostSettingPair> newException_; } @@ -52,3 +53,8 @@ class UpdatingContentSettingsObserver; - (IBAction)removeAllExceptions:(id)sender; @end + +@interface ContentExceptionsWindowController(VisibleForTesting) +- (void)cancel:(id)sender; +- (BOOL)editingNewException; +@end |