Upstream version 7.36.149.0

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

diff --git a/src/chrome/browser/ui/bookmarks/bookmark_tab_helper.cc b/src/chrome/browser/ui/bookmarks/bookmark_tab_helper.cc
index 33e8b34..ae526df 100644 (file)
--- a/src/chrome/browser/ui/bookmarks/bookmark_tab_helper.cc
+++ b/src/chrome/browser/ui/bookmarks/bookmark_tab_helper.cc
@@ -4,7 +4,6 @@
 
 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h"
 
-#include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/prefs/pref_service_syncable.h"
@@ -15,6 +14,7 @@
 #include "chrome/browser/ui/sad_tab.h"
 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h"
 #include "chrome/common/pref_names.h"
+#include "components/bookmarks/core/browser/bookmark_model.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/web_contents.h"
 
@@ -101,7 +101,8 @@ void BookmarkTabHelper::UpdateStarredStateForCurrentURL() {
 void BookmarkTabHelper::BookmarkModelChanged() {
 }
 
-void BookmarkTabHelper::Loaded(BookmarkModel* model, bool ids_reassigned) {
+void BookmarkTabHelper::BookmarkModelLoaded(BookmarkModel* model,
+                                            bool ids_reassigned) {
   UpdateStarredStateForCurrentURL();
 }
 
@@ -111,14 +112,18 @@ void BookmarkTabHelper::BookmarkNodeAdded(BookmarkModel* model,
   UpdateStarredStateForCurrentURL();
 }
 
-void BookmarkTabHelper::BookmarkNodeRemoved(BookmarkModel* model,
-                                            const BookmarkNode* parent,
-                                            int old_index,
-                                            const BookmarkNode* node) {
+void BookmarkTabHelper::BookmarkNodeRemoved(
+    BookmarkModel* model,
+    const BookmarkNode* parent,
+    int old_index,
+    const BookmarkNode* node,
+    const std::set<GURL>& removed_urls) {
   UpdateStarredStateForCurrentURL();
 }
 
-void BookmarkTabHelper::BookmarkAllNodesRemoved(BookmarkModel* model) {
+void BookmarkTabHelper::BookmarkAllNodesRemoved(
+    BookmarkModel* model,
+    const std::set<GURL>& removed_urls) {
   UpdateStarredStateForCurrentURL();
 }