| Index: chrome/browser/extensions/api/history/history_api.h
|
| diff --git a/chrome/browser/extensions/api/history/history_api.h b/chrome/browser/extensions/api/history/history_api.h
|
| index 1f89660a422122d7b8b3781c44bc3aafb7f79151..ccae66fb0c4872e09b8ec589a9a1449b930a8223 100644
|
| --- a/chrome/browser/extensions/api/history/history_api.h
|
| +++ b/chrome/browser/extensions/api/history/history_api.h
|
| @@ -32,20 +32,20 @@ class HistoryEventRouter : public content::NotificationObserver,
|
| public history::HistoryServiceObserver {
|
| public:
|
| HistoryEventRouter(Profile* profile, HistoryService* history_service);
|
| - virtual ~HistoryEventRouter();
|
| + ~HistoryEventRouter() override;
|
|
|
| private:
|
| // content::NotificationObserver::Observe.
|
| - virtual void Observe(int type,
|
| - const content::NotificationSource& source,
|
| - const content::NotificationDetails& details) override;
|
| + void Observe(int type,
|
| + const content::NotificationSource& source,
|
| + const content::NotificationDetails& details) override;
|
|
|
| // history::HistoryServiceObserver.
|
| - virtual void OnURLVisited(HistoryService* history_service,
|
| - ui::PageTransition transition,
|
| - const history::URLRow& row,
|
| - const history::RedirectList& redirects,
|
| - base::Time visit_time) override;
|
| + void OnURLVisited(HistoryService* history_service,
|
| + ui::PageTransition transition,
|
| + const history::URLRow& row,
|
| + const history::RedirectList& redirects,
|
| + base::Time visit_time) override;
|
|
|
| void HistoryUrlsRemoved(Profile* profile,
|
| const history::URLsDeletedDetails* details);
|
| @@ -66,16 +66,16 @@ class HistoryEventRouter : public content::NotificationObserver,
|
| class HistoryAPI : public BrowserContextKeyedAPI, public EventRouter::Observer {
|
| public:
|
| explicit HistoryAPI(content::BrowserContext* context);
|
| - virtual ~HistoryAPI();
|
| + ~HistoryAPI() override;
|
|
|
| // KeyedService implementation.
|
| - virtual void Shutdown() override;
|
| + void Shutdown() override;
|
|
|
| // BrowserContextKeyedAPI implementation.
|
| static BrowserContextKeyedAPIFactory<HistoryAPI>* GetFactoryInstance();
|
|
|
| // EventRouter::Observer implementation.
|
| - virtual void OnListenerAdded(const EventListenerInfo& details) override;
|
| + void OnListenerAdded(const EventListenerInfo& details) override;
|
|
|
| private:
|
| friend class BrowserContextKeyedAPIFactory<HistoryAPI>;
|
| @@ -98,7 +98,7 @@ void BrowserContextKeyedAPIFactory<HistoryAPI>::DeclareFactoryDependencies();
|
| // Base class for history function APIs.
|
| class HistoryFunction : public ChromeAsyncExtensionFunction {
|
| protected:
|
| - virtual ~HistoryFunction() {}
|
| + ~HistoryFunction() override {}
|
|
|
| bool ValidateUrl(const std::string& url_string, GURL* url);
|
| bool VerifyDeleteAllowed();
|
| @@ -112,10 +112,10 @@ class HistoryFunctionWithCallback : public HistoryFunction {
|
| HistoryFunctionWithCallback();
|
|
|
| protected:
|
| - virtual ~HistoryFunctionWithCallback();
|
| + ~HistoryFunctionWithCallback() override;
|
|
|
| // ExtensionFunction:
|
| - virtual bool RunAsync() override;
|
| + bool RunAsync() override;
|
|
|
| // Return true if the async call was completed, false otherwise.
|
| virtual bool RunAsyncImpl() = 0;
|
| @@ -138,10 +138,10 @@ class HistoryGetVisitsFunction : public HistoryFunctionWithCallback {
|
| DECLARE_EXTENSION_FUNCTION("history.getVisits", HISTORY_GETVISITS)
|
|
|
| protected:
|
| - virtual ~HistoryGetVisitsFunction() {}
|
| + ~HistoryGetVisitsFunction() override {}
|
|
|
| // HistoryFunctionWithCallback:
|
| - virtual bool RunAsyncImpl() override;
|
| + bool RunAsyncImpl() override;
|
|
|
| // Callback for the history function to provide results.
|
| void QueryComplete(bool success,
|
| @@ -154,10 +154,10 @@ class HistorySearchFunction : public HistoryFunctionWithCallback {
|
| DECLARE_EXTENSION_FUNCTION("history.search", HISTORY_SEARCH)
|
|
|
| protected:
|
| - virtual ~HistorySearchFunction() {}
|
| + ~HistorySearchFunction() override {}
|
|
|
| // HistoryFunctionWithCallback:
|
| - virtual bool RunAsyncImpl() override;
|
| + bool RunAsyncImpl() override;
|
|
|
| // Callback for the history function to provide results.
|
| void SearchComplete(history::QueryResults* results);
|
| @@ -168,10 +168,10 @@ class HistoryAddUrlFunction : public HistoryFunction {
|
| DECLARE_EXTENSION_FUNCTION("history.addUrl", HISTORY_ADDURL)
|
|
|
| protected:
|
| - virtual ~HistoryAddUrlFunction() {}
|
| + ~HistoryAddUrlFunction() override {}
|
|
|
| // HistoryFunctionWithCallback:
|
| - virtual bool RunAsync() override;
|
| + bool RunAsync() override;
|
| };
|
|
|
| class HistoryDeleteAllFunction : public HistoryFunctionWithCallback {
|
| @@ -179,10 +179,10 @@ class HistoryDeleteAllFunction : public HistoryFunctionWithCallback {
|
| DECLARE_EXTENSION_FUNCTION("history.deleteAll", HISTORY_DELETEALL)
|
|
|
| protected:
|
| - virtual ~HistoryDeleteAllFunction() {}
|
| + ~HistoryDeleteAllFunction() override {}
|
|
|
| // HistoryFunctionWithCallback:
|
| - virtual bool RunAsyncImpl() override;
|
| + bool RunAsyncImpl() override;
|
|
|
| // Callback for the history service to acknowledge deletion.
|
| void DeleteComplete();
|
| @@ -194,10 +194,10 @@ class HistoryDeleteUrlFunction : public HistoryFunction {
|
| DECLARE_EXTENSION_FUNCTION("history.deleteUrl", HISTORY_DELETEURL)
|
|
|
| protected:
|
| - virtual ~HistoryDeleteUrlFunction() {}
|
| + ~HistoryDeleteUrlFunction() override {}
|
|
|
| // HistoryFunctionWithCallback:
|
| - virtual bool RunAsync() override;
|
| + bool RunAsync() override;
|
| };
|
|
|
| class HistoryDeleteRangeFunction : public HistoryFunctionWithCallback {
|
| @@ -205,10 +205,10 @@ class HistoryDeleteRangeFunction : public HistoryFunctionWithCallback {
|
| DECLARE_EXTENSION_FUNCTION("history.deleteRange", HISTORY_DELETERANGE)
|
|
|
| protected:
|
| - virtual ~HistoryDeleteRangeFunction() {}
|
| + ~HistoryDeleteRangeFunction() override {}
|
|
|
| // HistoryFunctionWithCallback:
|
| - virtual bool RunAsyncImpl() override;
|
| + bool RunAsyncImpl() override;
|
|
|
| // Callback for the history service to acknowledge deletion.
|
| void DeleteComplete();
|
|
|