Index: chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.h |
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.h b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.h |
index 310c2717011d337f33882aafe6b9dfd42aa63a4a..1b8514d7f8e5919adb8524b557845591bf7dbd29 100644 |
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.h |
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.h |
@@ -7,8 +7,9 @@ |
#import <Cocoa/Cocoa.h> |
+#include <memory> |
+ |
#include "base/mac/scoped_nsobject.h" |
-#include "base/memory/scoped_ptr.h" |
#include "chrome/browser/ui/bookmarks/bookmark_editor.h" |
#include "components/bookmarks/browser/bookmark_expanded_state_tracker.h" |
@@ -49,7 +50,7 @@ class BookmarkModel; |
// there should only ever be one. |
base::scoped_nsobject<NSArray> tableSelectionPaths_; |
// C++ bridge object that observes the BookmarkModel for me. |
- scoped_ptr<BookmarkEditorBaseControllerBridge> observer_; |
+ std::unique_ptr<BookmarkEditorBaseControllerBridge> observer_; |
} |
@property(nonatomic, copy) NSString* initialName; |