| 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 cebe6dd7eb0ed3efff0daf55db0cc681f7344846..a9e6944af29f8bd21c8ef4916d9059e056f7e89f 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
|
| @@ -34,15 +34,15 @@ class BookmarkManagerPrivateEventRouter : public BaseBookmarkModelObserver {
|
| public:
|
| BookmarkManagerPrivateEventRouter(content::BrowserContext* browser_context,
|
| BookmarkModel* bookmark_model);
|
| - virtual ~BookmarkManagerPrivateEventRouter();
|
| + ~BookmarkManagerPrivateEventRouter() override;
|
|
|
| // BaseBookmarkModelObserver:
|
| - virtual void BookmarkModelChanged() override;
|
| - virtual void BookmarkModelBeingDeleted(BookmarkModel* model) override;
|
| - virtual void OnWillChangeBookmarkMetaInfo(BookmarkModel* model,
|
| - const BookmarkNode* node) override;
|
| - virtual void BookmarkMetaInfoChanged(BookmarkModel* model,
|
| - const BookmarkNode* node) override;
|
| + void BookmarkModelChanged() override;
|
| + void BookmarkModelBeingDeleted(BookmarkModel* model) override;
|
| + void OnWillChangeBookmarkMetaInfo(BookmarkModel* model,
|
| + const BookmarkNode* node) override;
|
| + void BookmarkMetaInfoChanged(BookmarkModel* model,
|
| + const BookmarkNode* node) override;
|
|
|
| private:
|
| // Helper to actually dispatch an event to extension listeners.
|
| @@ -60,17 +60,17 @@ class BookmarkManagerPrivateAPI : public BrowserContextKeyedAPI,
|
| public EventRouter::Observer {
|
| public:
|
| explicit BookmarkManagerPrivateAPI(content::BrowserContext* browser_context);
|
| - virtual ~BookmarkManagerPrivateAPI();
|
| + ~BookmarkManagerPrivateAPI() override;
|
|
|
| // BrowserContextKeyedService implementation.
|
| - virtual void Shutdown() override;
|
| + void Shutdown() override;
|
|
|
| // BrowserContextKeyedAPI implementation.
|
| static BrowserContextKeyedAPIFactory<BookmarkManagerPrivateAPI>*
|
| GetFactoryInstance();
|
|
|
| // EventRouter::Observer implementation.
|
| - virtual void OnListenerAdded(const EventListenerInfo& details) override;
|
| + void OnListenerAdded(const EventListenerInfo& details) override;
|
|
|
| private:
|
| friend class BrowserContextKeyedAPIFactory<BookmarkManagerPrivateAPI>;
|
| @@ -92,13 +92,13 @@ class BookmarkManagerPrivateDragEventRouter
|
| public:
|
| BookmarkManagerPrivateDragEventRouter(Profile* profile,
|
| content::WebContents* web_contents);
|
| - virtual ~BookmarkManagerPrivateDragEventRouter();
|
| + ~BookmarkManagerPrivateDragEventRouter() override;
|
|
|
| // BookmarkTabHelper::BookmarkDrag interface
|
| - virtual void OnDragEnter(const bookmarks::BookmarkNodeData& data) override;
|
| - virtual void OnDragOver(const bookmarks::BookmarkNodeData& data) override;
|
| - virtual void OnDragLeave(const bookmarks::BookmarkNodeData& data) override;
|
| - virtual void OnDrop(const bookmarks::BookmarkNodeData& data) override;
|
| + void OnDragEnter(const bookmarks::BookmarkNodeData& data) override;
|
| + void OnDragOver(const bookmarks::BookmarkNodeData& data) override;
|
| + void OnDragLeave(const bookmarks::BookmarkNodeData& data) override;
|
| + void OnDrop(const bookmarks::BookmarkNodeData& data) override;
|
|
|
| // The bookmark drag and drop data. This gets set after a drop was done on
|
| // the page. This returns NULL if no data is available.
|
| @@ -121,7 +121,7 @@ class BookmarkManagerPrivateDragEventRouter
|
|
|
| class ClipboardBookmarkManagerFunction : public extensions::BookmarksFunction {
|
| protected:
|
| - virtual ~ClipboardBookmarkManagerFunction() {}
|
| + ~ClipboardBookmarkManagerFunction() override {}
|
|
|
| bool CopyOrCut(bool cut, const std::vector<std::string>& id_list);
|
| };
|
| @@ -133,10 +133,10 @@ class BookmarkManagerPrivateCopyFunction
|
| BOOKMARKMANAGERPRIVATE_COPY)
|
|
|
| protected:
|
| - virtual ~BookmarkManagerPrivateCopyFunction() {}
|
| + ~BookmarkManagerPrivateCopyFunction() override {}
|
|
|
| // ExtensionFunction:
|
| - virtual bool RunOnReady() override;
|
| + bool RunOnReady() override;
|
| };
|
|
|
| class BookmarkManagerPrivateCutFunction
|
| @@ -146,10 +146,10 @@ class BookmarkManagerPrivateCutFunction
|
| BOOKMARKMANAGERPRIVATE_CUT)
|
|
|
| protected:
|
| - virtual ~BookmarkManagerPrivateCutFunction() {}
|
| + ~BookmarkManagerPrivateCutFunction() override {}
|
|
|
| // ExtensionFunction:
|
| - virtual bool RunOnReady() override;
|
| + bool RunOnReady() override;
|
| };
|
|
|
| class BookmarkManagerPrivatePasteFunction
|
| @@ -159,10 +159,10 @@ class BookmarkManagerPrivatePasteFunction
|
| BOOKMARKMANAGERPRIVATE_PASTE)
|
|
|
| protected:
|
| - virtual ~BookmarkManagerPrivatePasteFunction() {}
|
| + ~BookmarkManagerPrivatePasteFunction() override {}
|
|
|
| // ExtensionFunction:
|
| - virtual bool RunOnReady() override;
|
| + bool RunOnReady() override;
|
| };
|
|
|
| class BookmarkManagerPrivateCanPasteFunction
|
| @@ -172,10 +172,10 @@ class BookmarkManagerPrivateCanPasteFunction
|
| BOOKMARKMANAGERPRIVATE_CANPASTE)
|
|
|
| protected:
|
| - virtual ~BookmarkManagerPrivateCanPasteFunction() {}
|
| + ~BookmarkManagerPrivateCanPasteFunction() override {}
|
|
|
| // ExtensionFunction:
|
| - virtual bool RunOnReady() override;
|
| + bool RunOnReady() override;
|
| };
|
|
|
| class BookmarkManagerPrivateSortChildrenFunction
|
| @@ -185,10 +185,10 @@ class BookmarkManagerPrivateSortChildrenFunction
|
| BOOKMARKMANAGERPRIVATE_SORTCHILDREN)
|
|
|
| protected:
|
| - virtual ~BookmarkManagerPrivateSortChildrenFunction() {}
|
| + ~BookmarkManagerPrivateSortChildrenFunction() override {}
|
|
|
| // ExtensionFunction:
|
| - virtual bool RunOnReady() override;
|
| + bool RunOnReady() override;
|
| };
|
|
|
| class BookmarkManagerPrivateGetStringsFunction : public AsyncExtensionFunction {
|
| @@ -197,10 +197,10 @@ class BookmarkManagerPrivateGetStringsFunction : public AsyncExtensionFunction {
|
| BOOKMARKMANAGERPRIVATE_GETSTRINGS)
|
|
|
| protected:
|
| - virtual ~BookmarkManagerPrivateGetStringsFunction() {}
|
| + ~BookmarkManagerPrivateGetStringsFunction() override {}
|
|
|
| // ExtensionFunction:
|
| - virtual bool RunAsync() override;
|
| + bool RunAsync() override;
|
| };
|
|
|
| class BookmarkManagerPrivateStartDragFunction
|
| @@ -210,10 +210,10 @@ class BookmarkManagerPrivateStartDragFunction
|
| BOOKMARKMANAGERPRIVATE_STARTDRAG)
|
|
|
| protected:
|
| - virtual ~BookmarkManagerPrivateStartDragFunction() {}
|
| + ~BookmarkManagerPrivateStartDragFunction() override {}
|
|
|
| // ExtensionFunction:
|
| - virtual bool RunOnReady() override;
|
| + bool RunOnReady() override;
|
| };
|
|
|
| class BookmarkManagerPrivateDropFunction
|
| @@ -223,10 +223,10 @@ class BookmarkManagerPrivateDropFunction
|
| BOOKMARKMANAGERPRIVATE_DROP)
|
|
|
| protected:
|
| - virtual ~BookmarkManagerPrivateDropFunction() {}
|
| + ~BookmarkManagerPrivateDropFunction() override {}
|
|
|
| // ExtensionFunction:
|
| - virtual bool RunOnReady() override;
|
| + bool RunOnReady() override;
|
| };
|
|
|
| class BookmarkManagerPrivateGetSubtreeFunction
|
| @@ -236,10 +236,10 @@ class BookmarkManagerPrivateGetSubtreeFunction
|
| BOOKMARKMANAGERPRIVATE_GETSUBTREE)
|
|
|
| protected:
|
| - virtual ~BookmarkManagerPrivateGetSubtreeFunction() {}
|
| + ~BookmarkManagerPrivateGetSubtreeFunction() override {}
|
|
|
| // ExtensionFunction:
|
| - virtual bool RunOnReady() override;
|
| + bool RunOnReady() override;
|
| };
|
|
|
| class BookmarkManagerPrivateCanEditFunction
|
| @@ -249,10 +249,10 @@ class BookmarkManagerPrivateCanEditFunction
|
| BOOKMARKMANAGERPRIVATE_CANEDIT)
|
|
|
| protected:
|
| - virtual ~BookmarkManagerPrivateCanEditFunction() {}
|
| + ~BookmarkManagerPrivateCanEditFunction() override {}
|
|
|
| // ExtensionFunction:
|
| - virtual bool RunOnReady() override;
|
| + bool RunOnReady() override;
|
| };
|
|
|
| class BookmarkManagerPrivateRecordLaunchFunction
|
| @@ -262,10 +262,10 @@ class BookmarkManagerPrivateRecordLaunchFunction
|
| BOOKMARKMANAGERPRIVATE_RECORDLAUNCH)
|
|
|
| protected:
|
| - virtual ~BookmarkManagerPrivateRecordLaunchFunction() {}
|
| + ~BookmarkManagerPrivateRecordLaunchFunction() override {}
|
|
|
| // ExtensionFunction:
|
| - virtual bool RunOnReady() override;
|
| + bool RunOnReady() override;
|
| };
|
|
|
| class BookmarkManagerPrivateCreateWithMetaInfoFunction
|
| @@ -275,10 +275,10 @@ class BookmarkManagerPrivateCreateWithMetaInfoFunction
|
| BOOKMARKMANAGERPRIVATE_CREATEWITHMETAINFO)
|
|
|
| protected:
|
| - virtual ~BookmarkManagerPrivateCreateWithMetaInfoFunction() {}
|
| + ~BookmarkManagerPrivateCreateWithMetaInfoFunction() override {}
|
|
|
| // ExtensionFunction:
|
| - virtual bool RunOnReady() override;
|
| + bool RunOnReady() override;
|
| };
|
|
|
| class BookmarkManagerPrivateGetMetaInfoFunction
|
| @@ -288,10 +288,10 @@ class BookmarkManagerPrivateGetMetaInfoFunction
|
| BOOKMARKMANAGERPRIVATE_GETMETAINFO)
|
|
|
| protected:
|
| - virtual ~BookmarkManagerPrivateGetMetaInfoFunction() {}
|
| + ~BookmarkManagerPrivateGetMetaInfoFunction() override {}
|
|
|
| // ExtensionFunction:
|
| - virtual bool RunOnReady() override;
|
| + bool RunOnReady() override;
|
| };
|
|
|
| class BookmarkManagerPrivateSetMetaInfoFunction
|
| @@ -301,10 +301,10 @@ class BookmarkManagerPrivateSetMetaInfoFunction
|
| BOOKMARKMANAGERPRIVATE_SETMETAINFO)
|
|
|
| protected:
|
| - virtual ~BookmarkManagerPrivateSetMetaInfoFunction() {}
|
| + ~BookmarkManagerPrivateSetMetaInfoFunction() override {}
|
|
|
| // ExtensionFunction:
|
| - virtual bool RunOnReady() override;
|
| + bool RunOnReady() override;
|
| };
|
|
|
| class BookmarkManagerPrivateUpdateMetaInfoFunction
|
| @@ -314,10 +314,10 @@ class BookmarkManagerPrivateUpdateMetaInfoFunction
|
| BOOKMARKMANAGERPRIVATE_UPDATEMETAINFO)
|
|
|
| protected:
|
| - virtual ~BookmarkManagerPrivateUpdateMetaInfoFunction() {}
|
| + ~BookmarkManagerPrivateUpdateMetaInfoFunction() override {}
|
|
|
| // ExtensionFunction:
|
| - virtual bool RunOnReady() override;
|
| + bool RunOnReady() override;
|
| };
|
|
|
| class BookmarkManagerPrivateCanOpenNewWindowsFunction
|
| @@ -327,10 +327,10 @@ class BookmarkManagerPrivateCanOpenNewWindowsFunction
|
| BOOKMARKMANAGERPRIVATE_CANOPENNEWWINDOWS)
|
|
|
| protected:
|
| - virtual ~BookmarkManagerPrivateCanOpenNewWindowsFunction() {}
|
| + ~BookmarkManagerPrivateCanOpenNewWindowsFunction() override {}
|
|
|
| // ExtensionFunction:
|
| - virtual bool RunOnReady() override;
|
| + bool RunOnReady() override;
|
| };
|
|
|
| class BookmarkManagerPrivateRemoveTreesFunction
|
| @@ -340,10 +340,10 @@ class BookmarkManagerPrivateRemoveTreesFunction
|
| BOOKMARKMANAGERPRIVATE_REMOVETREES)
|
|
|
| protected:
|
| - virtual ~BookmarkManagerPrivateRemoveTreesFunction() {}
|
| + ~BookmarkManagerPrivateRemoveTreesFunction() override {}
|
|
|
| // ExtensionFunction:
|
| - virtual bool RunOnReady() override;
|
| + bool RunOnReady() override;
|
| };
|
|
|
| class BookmarkManagerPrivateUndoFunction
|
| @@ -353,10 +353,10 @@ class BookmarkManagerPrivateUndoFunction
|
| BOOKMARKMANAGERPRIVATE_UNDO)
|
|
|
| protected:
|
| - virtual ~BookmarkManagerPrivateUndoFunction() {}
|
| + ~BookmarkManagerPrivateUndoFunction() override {}
|
|
|
| // ExtensionFunction:
|
| - virtual bool RunOnReady() override;
|
| + bool RunOnReady() override;
|
| };
|
|
|
| class BookmarkManagerPrivateRedoFunction
|
| @@ -366,10 +366,10 @@ class BookmarkManagerPrivateRedoFunction
|
| BOOKMARKMANAGERPRIVATE_REDO)
|
|
|
| protected:
|
| - virtual ~BookmarkManagerPrivateRedoFunction() {}
|
| + ~BookmarkManagerPrivateRedoFunction() override {}
|
|
|
| // ExtensionFunction:
|
| - virtual bool RunOnReady() override;
|
| + bool RunOnReady() override;
|
| };
|
|
|
| class BookmarkManagerPrivateGetUndoInfoFunction
|
| @@ -379,10 +379,10 @@ class BookmarkManagerPrivateGetUndoInfoFunction
|
| BOOKMARKMANAGERPRIVATE_UNDOINFO)
|
|
|
| protected:
|
| - virtual ~BookmarkManagerPrivateGetUndoInfoFunction() {}
|
| + ~BookmarkManagerPrivateGetUndoInfoFunction() override {}
|
|
|
| // ExtensionFunction:
|
| - virtual bool RunOnReady() override;
|
| + bool RunOnReady() override;
|
| };
|
|
|
| class BookmarkManagerPrivateGetRedoInfoFunction
|
| @@ -392,10 +392,10 @@ class BookmarkManagerPrivateGetRedoInfoFunction
|
| BOOKMARKMANAGERPRIVATE_REDOINFO)
|
|
|
| protected:
|
| - virtual ~BookmarkManagerPrivateGetRedoInfoFunction() {}
|
| + ~BookmarkManagerPrivateGetRedoInfoFunction() override {}
|
|
|
| // ExtensionFunction:
|
| - virtual bool RunOnReady() override;
|
| + bool RunOnReady() override;
|
| };
|
|
|
| class BookmarkManagerPrivateSetVersionFunction
|
| @@ -405,10 +405,10 @@ class BookmarkManagerPrivateSetVersionFunction
|
| BOOKMARKMANAGERPRIVATE_SETVERSION);
|
|
|
| protected:
|
| - virtual ~BookmarkManagerPrivateSetVersionFunction() {}
|
| + ~BookmarkManagerPrivateSetVersionFunction() override {}
|
|
|
| // ExtensionFunction:
|
| - virtual bool RunOnReady() override;
|
| + bool RunOnReady() override;
|
| };
|
|
|
| } // namespace extensions
|
|
|