Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1173)

Unified Diff: chrome/browser/ui/cocoa/extensions/browser_actions_controller.h

Issue 1865213004: Convert //chrome/browser/ui from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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).

Powered by Google App Engine
This is Rietveld 408576698