| Index: chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.h
|
| diff --git a/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.h b/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.h
|
| index 71d193f6f193d2b63df0c7182b7bb7d8172bf19a..87362d67d6c75dae67170b914f24d712fd7156c7 100644
|
| --- a/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.h
|
| +++ b/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.h
|
| @@ -9,6 +9,7 @@
|
| #include "chrome/browser/browsing_data/cookies_tree_model.h"
|
| #include "chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.h"
|
| #import "chrome/browser/ui/cocoa/content_settings/cookie_tree_node.h"
|
| +#import "chrome/browser/ui/cocoa/content_settings/cookies_tree_controller_bridge.h"
|
| #include "content/public/browser/notification_observer.h"
|
| #include "content/public/browser/notification_registrar.h"
|
|
|
| @@ -71,11 +72,12 @@ class CollectedCookiesMac : public ConstrainedWindowMacDelegate,
|
| base::scoped_nsobject<NSMutableArray> icons_;
|
|
|
| // Our Cocoa copy of the model.
|
| - base::scoped_nsobject<CocoaCookieTreeNode> cocoaAllowedTreeModel_;
|
| - base::scoped_nsobject<CocoaCookieTreeNode> cocoaBlockedTreeModel_;
|
| + scoped_ptr<CookiesTreeControllerBridge> allowedControllerBridge_;
|
| + scoped_ptr<CookiesTreeControllerBridge> blockedControllerBridge_;
|
|
|
| BOOL allowedCookiesButtonsEnabled_;
|
| BOOL blockedCookiesButtonsEnabled_;
|
| + BOOL deleteCookiesButtonEnabled_; // Only in the allowed pane.
|
|
|
| IBOutlet NSTreeController* allowedTreeController_;
|
| IBOutlet NSTreeController* blockedTreeController_;
|
| @@ -116,6 +118,7 @@ class CollectedCookiesMac : public ConstrainedWindowMacDelegate,
|
|
|
| @property(assign, nonatomic) BOOL allowedCookiesButtonsEnabled;
|
| @property(assign, nonatomic) BOOL blockedCookiesButtonsEnabled;
|
| +@property(assign, nonatomic) BOOL deleteCookiesButtonEnabled;
|
|
|
| // Designated initializer. The WebContents cannot be NULL.
|
| - (id)initWithWebContents:(content::WebContents*)webContents
|
| @@ -128,11 +131,12 @@ class CollectedCookiesMac : public ConstrainedWindowMacDelegate,
|
| - (IBAction)allowForSessionFromOrigin:(id)sender;
|
| - (IBAction)blockOrigin:(id)sender;
|
|
|
| +// Allows the deletion of set cookies (only visible in the Allowed pane).
|
| +- (IBAction)deleteSelected:(id)sender;
|
| +
|
| // Returns the |cocoaAllowedTreeModel_| and |cocoaBlockedTreeModel_|.
|
| - (CocoaCookieTreeNode*)cocoaAllowedTreeModel;
|
| - (CocoaCookieTreeNode*)cocoaBlockedTreeModel;
|
| -- (void)setCocoaAllowedTreeModel:(CocoaCookieTreeNode*)model;
|
| -- (void)setCocoaBlockedTreeModel:(CocoaCookieTreeNode*)model;
|
|
|
| // Returns the |allowedTreeModel_| and |blockedTreeModel_|.
|
| - (CookiesTreeModel*)allowedTreeModel;
|
|
|