| 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 e895491e652744a00c829605533f6ed142d5c5bd..f602b69a5a41db6f5ed635684f99fc4c1887f44b 100644
|
| --- a/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.h
|
| +++ b/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.h
|
| @@ -4,9 +4,10 @@
|
|
|
| #import <Cocoa/Cocoa.h>
|
|
|
| +#include <memory>
|
| +
|
| #include "base/mac/scoped_nsobject.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #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"
|
| @@ -47,7 +48,7 @@ class CollectedCookiesMac : public ConstrainedWindowMacDelegate,
|
|
|
| content::NotificationRegistrar registrar_;
|
|
|
| - scoped_ptr<ConstrainedWindowMac> window_;
|
| + std::unique_ptr<ConstrainedWindowMac> window_;
|
|
|
| base::scoped_nsobject<CollectedCookiesWindowController> sheet_controller_;
|
|
|
| @@ -65,15 +66,15 @@ class CollectedCookiesMac : public ConstrainedWindowMacDelegate,
|
| NSWindowDelegate> {
|
| @private
|
| // Platform-independent model.
|
| - scoped_ptr<CookiesTreeModel> allowedTreeModel_;
|
| - scoped_ptr<CookiesTreeModel> blockedTreeModel_;
|
| + std::unique_ptr<CookiesTreeModel> allowedTreeModel_;
|
| + std::unique_ptr<CookiesTreeModel> blockedTreeModel_;
|
|
|
| // Cached array of icons.
|
| base::scoped_nsobject<NSMutableArray> icons_;
|
|
|
| // Our Cocoa copy of the model.
|
| - scoped_ptr<CookiesTreeControllerBridge> allowedControllerBridge_;
|
| - scoped_ptr<CookiesTreeControllerBridge> blockedControllerBridge_;
|
| + std::unique_ptr<CookiesTreeControllerBridge> allowedControllerBridge_;
|
| + std::unique_ptr<CookiesTreeControllerBridge> blockedControllerBridge_;
|
|
|
| BOOL allowedCookiesButtonsEnabled_;
|
| BOOL blockedCookiesButtonsEnabled_;
|
|
|