Upstream version 9.38.198.0

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

diff --git a/src/chrome/browser/ui/bookmarks/bookmark_tab_helper.h b/src/chrome/browser/ui/bookmarks/bookmark_tab_helper.h
index f237334..fcb07db 100644 (file)
--- a/src/chrome/browser/ui/bookmarks/bookmark_tab_helper.h
+++ b/src/chrome/browser/ui/bookmarks/bookmark_tab_helper.h
@@ -5,13 +5,16 @@
 #ifndef CHROME_BROWSER_UI_BOOKMARKS_BOOKMARK_TAB_HELPER_H_
 #define CHROME_BROWSER_UI_BOOKMARKS_BOOKMARK_TAB_HELPER_H_
 
-#include "chrome/browser/bookmarks/base_bookmark_model_observer.h"
+#include "components/bookmarks/browser/base_bookmark_model_observer.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/browser/web_contents_user_data.h"
 
-struct BookmarkNodeData;
 class BookmarkTabHelperDelegate;
 
+namespace bookmarks {
+struct BookmarkNodeData;
+}
+
 namespace content {
 class WebContents;
 }
@@ -25,10 +28,10 @@ class BookmarkTabHelper
   // Interface for forwarding bookmark drag and drop to extenstions.
   class BookmarkDrag {
    public:
-    virtual void OnDragEnter(const BookmarkNodeData& data) = 0;
-    virtual void OnDragOver(const BookmarkNodeData& data) = 0;
-    virtual void OnDragLeave(const BookmarkNodeData& data) = 0;
-    virtual void OnDrop(const BookmarkNodeData& data) = 0;
+    virtual void OnDragEnter(const bookmarks::BookmarkNodeData& data) = 0;
+    virtual void OnDragOver(const bookmarks::BookmarkNodeData& data) = 0;
+    virtual void OnDragLeave(const bookmarks::BookmarkNodeData& data) = 0;
+    virtual void OnDrop(const bookmarks::BookmarkNodeData& data) = 0;
 
    protected:
     virtual ~BookmarkDrag() {}
@@ -72,8 +75,11 @@ class BookmarkTabHelper
   virtual void BookmarkNodeRemoved(BookmarkModel* model,
                                    const BookmarkNode* parent,
                                    int old_index,
-                                   const BookmarkNode* node) OVERRIDE;
-  virtual void BookmarkAllNodesRemoved(BookmarkModel* model) OVERRIDE;
+                                   const BookmarkNode* node,
+                                   const std::set<GURL>& removed_urls) OVERRIDE;
+  virtual void BookmarkAllUserNodesRemoved(
+      BookmarkModel* model,
+      const std::set<GURL>& removed_urls) OVERRIDE;
 
   virtual void BookmarkNodeChanged(BookmarkModel* model,
                                    const BookmarkNode* node) OVERRIDE;