| Index: chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller.h
|
| diff --git a/chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller.h b/chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller.h
|
| index 0a75328a7e88ae4bd326f810ebd62b6984e9b1ca..5559c85751713adf3b6da1680c525b8d2417b963 100644
|
| --- a/chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller.h
|
| +++ b/chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller.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"
|
| #import "chrome/browser/ui/cocoa/base_bubble_controller.h"
|
| #include "chrome/browser/ui/website_settings/website_settings_ui.h"
|
| #include "components/security_state/security_state_model.h"
|
| @@ -73,11 +74,11 @@ class WebContents;
|
|
|
| // The UI translates user actions to specific events and forwards them to the
|
| // |presenter_|. The |presenter_| handles these events and updates the UI.
|
| - scoped_ptr<WebsiteSettings> presenter_;
|
| + std::unique_ptr<WebsiteSettings> presenter_;
|
|
|
| // Bridge which implements the WebsiteSettingsUI interface and forwards
|
| // methods on to this class.
|
| - scoped_ptr<WebsiteSettingsUIBridge> bridge_;
|
| + std::unique_ptr<WebsiteSettingsUIBridge> bridge_;
|
| }
|
|
|
| // Designated initializer. The controller will release itself when the bubble
|
|
|