Index: chrome/browser/ui/cocoa/extensions/browser_actions_controller.h |
diff --git a/chrome/browser/ui/cocoa/extensions/browser_actions_controller.h b/chrome/browser/ui/cocoa/extensions/browser_actions_controller.h |
index 9af7224987308e68d93712959f7b63d758f995b6..8f55b68015635aec86b63175988f3969e1f2068e 100644 |
--- a/chrome/browser/ui/cocoa/extensions/browser_actions_controller.h |
+++ b/chrome/browser/ui/cocoa/extensions/browser_actions_controller.h |
@@ -7,8 +7,9 @@ |
#import <Cocoa/Cocoa.h> |
+#include <memory> |
+ |
#import "base/mac/scoped_nsobject.h" |
-#include "base/memory/scoped_ptr.h" |
#import "chrome/browser/ui/cocoa/has_weak_browser_pointer.h" |
#include "ui/gfx/geometry/size.h" |
@@ -43,10 +44,10 @@ extern NSString* const kBrowserActionVisibilityChangedNotification; |
base::scoped_nsobject<NSMutableArray> buttons_; |
// The delegate for the ToolbarActionsBar. |
- scoped_ptr<ToolbarActionsBarDelegate> toolbarActionsBarBridge_; |
+ std::unique_ptr<ToolbarActionsBarDelegate> toolbarActionsBarBridge_; |
// The controlling ToolbarActionsBar. |
- scoped_ptr<ToolbarActionsBar> toolbarActionsBar_; |
+ std::unique_ptr<ToolbarActionsBar> toolbarActionsBar_; |
// True if we should supppress the chevron (we do this during drag |
// animations). |