Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / bookmarks / chrome_bookmark_client.h

diff --git a/src/chrome/browser/bookmarks/chrome_bookmark_client.h b/src/chrome/browser/bookmarks/chrome_bookmark_client.h
index c9a28b3..8d3abe7 100644 (file)
--- a/src/chrome/browser/bookmarks/chrome_bookmark_client.h
+++ b/src/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(
+      base::CancelableTaskTracker* tracker) override;
+  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;
+      NodeTypedCountPairs* node_typed_count_pairs) 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,
-                                   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 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;
+  void BookmarkModelLoaded(BookmarkModel* model, bool ids_reassigned) override;
 
   // Helper for GetLoadExtraNodesCallback().
   static bookmarks::BookmarkPermanentNodeList LoadExtraNodes(