| Index: chrome/browser/ui/cocoa/global_error_bubble_controller.h
|
| diff --git a/chrome/browser/ui/cocoa/global_error_bubble_controller.h b/chrome/browser/ui/cocoa/global_error_bubble_controller.h
|
| index 425deeb5a7323558a94616dd796307b448c9a7e7..1ce24bc756d033531ff7ca44338dedf86b736dda 100644
|
| --- a/chrome/browser/ui/cocoa/global_error_bubble_controller.h
|
| +++ b/chrome/browser/ui/cocoa/global_error_bubble_controller.h
|
| @@ -7,7 +7,8 @@
|
|
|
| #import <Cocoa/Cocoa.h>
|
|
|
| -#include "base/memory/scoped_ptr.h"
|
| +#include <memory>
|
| +
|
| #include "base/memory/weak_ptr.h"
|
| #import "chrome/browser/ui/cocoa/base_bubble_controller.h"
|
|
|
| @@ -26,7 +27,7 @@ class Bridge;
|
| @interface GlobalErrorBubbleController : BaseBubbleController {
|
| @private
|
| base::WeakPtr<GlobalErrorWithStandardBubble> error_;
|
| - scoped_ptr<GlobalErrorBubbleControllerInternal::Bridge> bridge_;
|
| + std::unique_ptr<GlobalErrorBubbleControllerInternal::Bridge> bridge_;
|
| Browser* browser_;
|
|
|
| IBOutlet NSImageView* iconView_;
|
|
|