diff options
author | danno@chromium.org <danno@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-12 06:54:09 +0000 |
---|---|---|
committer | danno@chromium.org <danno@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-12 06:54:09 +0000 |
commit | d0edf4e5adf877515ff49a59f63600fd88a25b36 (patch) | |
tree | ad789884b7918146fcbcddaf4f10284836ff3496 /chrome/browser/cocoa/cookie_tree_node.mm | |
parent | 5fed0f1c5195ded63dfadadeb93c0b1d006f1fb4 (diff) | |
download | chromium_src-d0edf4e5adf877515ff49a59f63600fd88a25b36.zip chromium_src-d0edf4e5adf877515ff49a59f63600fd88a25b36.tar.gz chromium_src-d0edf4e5adf877515ff49a59f63600fd88a25b36.tar.bz2 |
[Mac] augment modal cookie prompt on mac to include details pane
Added two new xibs. The first is a cookie info view that is shared between the tree that shows browser data and the cookie modal prompt to block accepting cookies. The second is a window to replace the NSAlert modal dialog for the cookie prompt. Modified cookie tree code and added cookie prompt code to use new xibs.
Changed "hidden" handling of cookie detail view to use bindings rather than explicit code.
TODOs for http://crbug.com/36948 not in this CL:
- changing the expiration for cookies isn't implemented
TEST=manually testing of modal cookie prompt, new unit tests
BUG=http://crbug.com/36948
Review URL: http://codereview.chromium.org/669127
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41408 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa/cookie_tree_node.mm')
-rw-r--r-- | chrome/browser/cocoa/cookie_tree_node.mm | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/chrome/browser/cocoa/cookie_tree_node.mm b/chrome/browser/cocoa/cookie_tree_node.mm index 3d9eeaa..376df82 100644 --- a/chrome/browser/cocoa/cookie_tree_node.mm +++ b/chrome/browser/cocoa/cookie_tree_node.mm @@ -121,6 +121,27 @@ [self nodeType], [[self children] count]]; } +- (BOOL)isFolderOrCookieTreeDetails { + return [self nodeType] == kCocoaCookieTreeNodeTypeFolder || + [self nodeType] == kCocoaCookieTreeNodeTypeCookie; +} + +- (BOOL)isDatabaseTreeDetails { + return [self nodeType] == kCocoaCookieTreeNodeTypeDatabaseStorage; +} + +- (BOOL)isLocalStorageTreeDetails { + return [self nodeType] == kCocoaCookieTreeNodeTypeLocalStorage; +} + +- (BOOL)isDatabasePromptDetails { + return false; +} + +- (BOOL)isLocalStoragePromptDetails { + return false; +} + #pragma mark Cookie Accessors - (NSString*)name { @@ -167,4 +188,24 @@ return databaseDescription_.get(); } +#pragma mark Unused Accessors + +// This method is never called for the cookie tree, it is only +// only included because the Cocoa bindings for the shared view +// used to display browser data details always expects the method +// even though it is only used in the cookie prompt window. +- (id)localStorageKey { + NOTIMPLEMENTED(); + return nil; +} + +// This method is never called for the cookie tree, it is only +// only included because the Cocoa bindings for the shared view +// used to display browser data details always expects the method +// even though it is only used in the cookie prompt window. +- (id)localStorageValue { + NOTIMPLEMENTED(); + return nil; +} + @end |