| Index: chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.h
|
| diff --git a/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.h b/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.h
|
| index 3943a2358e80fb8de04c80a55263f7fcded27669..ba4b298a2f29896696cb3fd32d7b60e470a01172 100644
|
| --- a/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.h
|
| +++ b/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.h
|
| @@ -5,8 +5,9 @@
|
| #ifndef CHROME_BROWSER_EXTENSIONS_API_BOOKMARK_MANAGER_PRIVATE_BOOKMARK_MANAGER_PRIVATE_API_H_
|
| #define CHROME_BROWSER_EXTENSIONS_API_BOOKMARK_MANAGER_PRIVATE_BOOKMARK_MANAGER_PRIVATE_API_H_
|
|
|
| +#include <memory>
|
| +
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/values.h"
|
| #include "chrome/browser/extensions/api/bookmarks/bookmarks_api.h"
|
| #include "chrome/browser/extensions/chrome_extension_function.h"
|
| @@ -51,7 +52,7 @@ class BookmarkManagerPrivateEventRouter
|
| // Helper to actually dispatch an event to extension listeners.
|
| void DispatchEvent(events::HistogramValue histogram_value,
|
| const std::string& event_name,
|
| - scoped_ptr<base::ListValue> event_args);
|
| + std::unique_ptr<base::ListValue> event_args);
|
|
|
| // Remembers the previous meta info of a node before it was changed.
|
| bookmarks::BookmarkNode::MetaInfoMap prev_meta_info_;
|
| @@ -86,7 +87,7 @@ class BookmarkManagerPrivateAPI : public BrowserContextKeyedAPI,
|
| content::BrowserContext* browser_context_;
|
|
|
| // Created lazily upon OnListenerAdded.
|
| - scoped_ptr<BookmarkManagerPrivateEventRouter> event_router_;
|
| + std::unique_ptr<BookmarkManagerPrivateEventRouter> event_router_;
|
| };
|
|
|
| // Class that handles the drag and drop related chrome.bookmarkManagerPrivate
|
| @@ -115,7 +116,7 @@ class BookmarkManagerPrivateDragEventRouter
|
| // Helper to actually dispatch an event to extension listeners.
|
| void DispatchEvent(events::HistogramValue histogram_value,
|
| const std::string& event_name,
|
| - scoped_ptr<base::ListValue> args);
|
| + std::unique_ptr<base::ListValue> args);
|
|
|
| Profile* profile_;
|
| content::WebContents* web_contents_;
|
|
|