summaryrefslogtreecommitdiffstats
path: root/chrome/browser/bookmarks
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/bookmarks')
-rw-r--r--chrome/browser/bookmarks/bookmark_html_writer.h8
-rw-r--r--chrome/browser/bookmarks/bookmark_html_writer_unittest.cc4
-rw-r--r--chrome/browser/bookmarks/bookmark_model_factory.h10
-rw-r--r--chrome/browser/bookmarks/chrome_bookmark_client.h44
-rw-r--r--chrome/browser/bookmarks/chrome_bookmark_client_factory.h8
5 files changed, 34 insertions, 40 deletions
diff --git a/chrome/browser/bookmarks/bookmark_html_writer.h b/chrome/browser/bookmarks/bookmark_html_writer.h
index a37981f..7badebb 100644
--- a/chrome/browser/bookmarks/bookmark_html_writer.h
+++ b/chrome/browser/bookmarks/bookmark_html_writer.h
@@ -46,15 +46,15 @@ class BookmarkFaviconFetcher: public content::NotificationObserver {
BookmarkFaviconFetcher(Profile* profile,
const base::FilePath& path,
BookmarksExportObserver* observer);
- virtual ~BookmarkFaviconFetcher();
+ ~BookmarkFaviconFetcher() override;
// Executes bookmark export process.
void ExportBookmarks();
// content::NotificationObserver implementation.
- 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;
private:
// Recursively extracts URLs from bookmarks.
diff --git a/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc b/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc
index 9c473e5..cc9da03 100644
--- a/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc
+++ b/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc
@@ -130,9 +130,7 @@ class BookmarksObserver : public BookmarksExportObserver {
DCHECK(loop);
}
- virtual void OnExportFinished() override {
- loop_->Quit();
- }
+ void OnExportFinished() override { loop_->Quit(); }
private:
base::RunLoop* loop_;
diff --git a/chrome/browser/bookmarks/bookmark_model_factory.h b/chrome/browser/bookmarks/bookmark_model_factory.h
index 17ed822..5c98c21 100644
--- a/chrome/browser/bookmarks/bookmark_model_factory.h
+++ b/chrome/browser/bookmarks/bookmark_model_factory.h
@@ -26,16 +26,16 @@ class BookmarkModelFactory : public BrowserContextKeyedServiceFactory {
friend struct DefaultSingletonTraits<BookmarkModelFactory>;
BookmarkModelFactory();
- virtual ~BookmarkModelFactory();
+ ~BookmarkModelFactory() override;
// BrowserContextKeyedServiceFactory:
- virtual KeyedService* BuildServiceInstanceFor(
+ KeyedService* BuildServiceInstanceFor(
content::BrowserContext* context) const override;
- virtual void RegisterProfilePrefs(
+ void RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) override;
- virtual content::BrowserContext* GetBrowserContextToUse(
+ content::BrowserContext* GetBrowserContextToUse(
content::BrowserContext* context) const override;
- virtual bool ServiceIsNULLWhileTesting() const override;
+ bool ServiceIsNULLWhileTesting() const override;
DISALLOW_COPY_AND_ASSIGN(BookmarkModelFactory);
};
diff --git a/chrome/browser/bookmarks/chrome_bookmark_client.h b/chrome/browser/bookmarks/chrome_bookmark_client.h
index f6e4d2d..8d3abe7 100644
--- a/chrome/browser/bookmarks/chrome_bookmark_client.h
+++ b/chrome/browser/bookmarks/chrome_bookmark_client.h
@@ -25,12 +25,12 @@ class ChromeBookmarkClient : public bookmarks::BookmarkClient,
public BaseBookmarkModelObserver {
public:
explicit ChromeBookmarkClient(Profile* profile);
- virtual ~ChromeBookmarkClient();
+ ~ChromeBookmarkClient() override;
void Init(BookmarkModel* model);
// KeyedService:
- virtual void Shutdown() override;
+ void Shutdown() override;
// Returns the managed_node.
const BookmarkNode* managed_node() { return managed_node_; }
@@ -43,41 +43,37 @@ class ChromeBookmarkClient : public bookmarks::BookmarkClient,
const std::vector<const BookmarkNode*>& list);
// bookmarks::BookmarkClient:
- virtual bool PreferTouchIcon() override;
- virtual base::CancelableTaskTracker::TaskId GetFaviconImageForPageURL(
+ bool PreferTouchIcon() override;
+ base::CancelableTaskTracker::TaskId GetFaviconImageForPageURL(
const GURL& page_url,
favicon_base::IconType type,
const favicon_base::FaviconImageCallback& callback,
base::CancelableTaskTracker* tracker) override;
- virtual bool SupportsTypedCountForNodes() override;
- virtual void GetTypedCountForNodes(
+ bool SupportsTypedCountForNodes() override;
+ void GetTypedCountForNodes(
const NodeSet& nodes,
NodeTypedCountPairs* node_typed_count_pairs) override;
- virtual bool IsPermanentNodeVisible(
- const BookmarkPermanentNode* node) override;
- virtual void RecordAction(const base::UserMetricsAction& action) override;
- virtual bookmarks::LoadExtraCallback GetLoadExtraNodesCallback() override;
- virtual bool CanSetPermanentNodeTitle(
- const BookmarkNode* permanent_node) override;
- virtual bool CanSyncNode(const BookmarkNode* node) override;
- virtual bool CanBeEditedByUser(const BookmarkNode* node) override;
+ bool IsPermanentNodeVisible(const BookmarkPermanentNode* node) override;
+ void RecordAction(const base::UserMetricsAction& action) override;
+ bookmarks::LoadExtraCallback GetLoadExtraNodesCallback() override;
+ bool CanSetPermanentNodeTitle(const BookmarkNode* permanent_node) override;
+ bool CanSyncNode(const BookmarkNode* node) override;
+ bool CanBeEditedByUser(const BookmarkNode* node) override;
private:
friend class HistoryServiceFactory;
void SetHistoryService(HistoryService* history_service);
// BaseBookmarkModelObserver:
- virtual void BookmarkModelChanged() override;
- virtual void BookmarkNodeRemoved(BookmarkModel* model,
- const BookmarkNode* parent,
- int old_index,
- const BookmarkNode* node,
+ void BookmarkModelChanged() override;
+ void BookmarkNodeRemoved(BookmarkModel* model,
+ const BookmarkNode* parent,
+ int old_index,
+ const BookmarkNode* node,
+ const std::set<GURL>& removed_urls) override;
+ void BookmarkAllUserNodesRemoved(BookmarkModel* model,
const std::set<GURL>& removed_urls) override;
- virtual void BookmarkAllUserNodesRemoved(
- BookmarkModel* model,
- const std::set<GURL>& removed_urls) override;
- virtual void BookmarkModelLoaded(BookmarkModel* model,
- bool ids_reassigned) override;
+ void BookmarkModelLoaded(BookmarkModel* model, bool ids_reassigned) override;
// Helper for GetLoadExtraNodesCallback().
static bookmarks::BookmarkPermanentNodeList LoadExtraNodes(
diff --git a/chrome/browser/bookmarks/chrome_bookmark_client_factory.h b/chrome/browser/bookmarks/chrome_bookmark_client_factory.h
index 0ffefc8..597728bb 100644
--- a/chrome/browser/bookmarks/chrome_bookmark_client_factory.h
+++ b/chrome/browser/bookmarks/chrome_bookmark_client_factory.h
@@ -26,14 +26,14 @@ class ChromeBookmarkClientFactory : public BrowserContextKeyedServiceFactory {
friend struct DefaultSingletonTraits<ChromeBookmarkClientFactory>;
ChromeBookmarkClientFactory();
- virtual ~ChromeBookmarkClientFactory();
+ ~ChromeBookmarkClientFactory() override;
// BrowserContextKeyedServiceFactory:
- virtual KeyedService* BuildServiceInstanceFor(
+ KeyedService* BuildServiceInstanceFor(
content::BrowserContext* context) const override;
- virtual content::BrowserContext* GetBrowserContextToUse(
+ content::BrowserContext* GetBrowserContextToUse(
content::BrowserContext* context) const override;
- virtual bool ServiceIsNULLWhileTesting() const override;
+ bool ServiceIsNULLWhileTesting() const override;
DISALLOW_COPY_AND_ASSIGN(ChromeBookmarkClientFactory);
};
generated by cgit v1.1 at 2025-05-15 07:45:04 +0000