Update To 11.40.268.0

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

diff --git a/src/chrome/browser/bookmarks/bookmark_html_writer.h b/src/chrome/browser/bookmarks/bookmark_html_writer.h
index bdb638c..7badebb 100644 (file)
--- a/src/chrome/browser/bookmarks/bookmark_html_writer.h
+++ b/src/chrome/browser/bookmarks/bookmark_html_writer.h
@@ -21,7 +21,7 @@ class BookmarkNode;
 class Profile;
 
 namespace chrome {
-struct FaviconBitmapResult;
+struct FaviconRawBitmapResult;
 }
 
 // Observer for bookmark html output. Used only in tests.
@@ -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.
@@ -71,7 +71,7 @@ class BookmarkFaviconFetcher: public content::NotificationObserver {
   // Favicon fetch callback. After all favicons are fetched executes
   // html output on the file thread.
   void OnFaviconDataAvailable(
-      const favicon_base::FaviconBitmapResult& bitmap_result);
+      const favicon_base::FaviconRawBitmapResult& bitmap_result);
 
   // The Profile object used for accessing FaviconService, bookmarks model.
   Profile* profile_;