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

Unified Diff: chrome/browser/ui/cocoa/extensions/browser_actions_container_view.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_container_view.h
diff --git a/chrome/browser/ui/cocoa/extensions/browser_actions_container_view.h b/chrome/browser/ui/cocoa/extensions/browser_actions_container_view.h
index 12bd9a3ed9c4446c37a5fb9feb5f1a83e1eaaf56..3b89f82071fe2a796fafda824ca42530922259c1 100644
--- a/chrome/browser/ui/cocoa/extensions/browser_actions_container_view.h
+++ b/chrome/browser/ui/cocoa/extensions/browser_actions_container_view.h
@@ -7,8 +7,9 @@
#import <Cocoa/Cocoa.h>
+#include <memory>
+
#include "base/mac/scoped_nsobject.h"
-#include "base/memory/scoped_ptr.h"
namespace ui {
struct NinePartImageIds;
@@ -98,7 +99,7 @@ class BrowserActionsContainerViewSizeDelegate {
BOOL grippyPinned_;
// The nine-grid of the highlight to paint, if any.
- scoped_ptr<ui::NinePartImageIds> highlight_;
+ std::unique_ptr<ui::NinePartImageIds> highlight_;
// The size delegate, if any.
// Weak; delegate is responsible for adding/removing itself.
@@ -111,7 +112,7 @@ class BrowserActionsContainerViewSizeDelegate {
- (void)setIsOverflow:(BOOL)isOverflow;
// Sets whether or not the container is highlighting.
-- (void)setHighlight:(scoped_ptr<ui::NinePartImageIds>)highlight;
+- (void)setHighlight:(std::unique_ptr<ui::NinePartImageIds>)highlight;
// Reeturns true if the container is currently highlighting.
- (BOOL)isHighlighting;

Powered by Google App Engine
This is Rietveld 408576698