Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / cocoa / bookmarks / bookmark_bar_bridge.mm

diff --git a/src/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge.mm b/src/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge.mm
index 3283efd..0bf2e91 100644 (file)
--- a/src/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge.mm
+++ b/src/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge.mm
@@ -6,10 +6,10 @@
 
 #include "base/bind.h"
 #include "base/prefs/pref_service.h"
-#include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h"
 #include "chrome/common/pref_names.h"
+#include "components/bookmarks/core/browser/bookmark_model.h"
 
 
 BookmarkBarBridge::BookmarkBarBridge(Profile* profile,
@@ -23,7 +23,7 @@ BookmarkBarBridge::BookmarkBarBridge(Profile* profile,
   // Bookmark loading is async; it may may not have happened yet.
   // We will be notified when that happens with the AddObserver() call.
   if (model->loaded())
-    Loaded(model, false);
+    BookmarkModelLoaded(model, false);
 
   profile_pref_registrar_.Init(profile->GetPrefs());
   profile_pref_registrar_.Add(
@@ -38,7 +38,8 @@ BookmarkBarBridge::~BookmarkBarBridge() {
   model_->RemoveObserver(this);
 }
 
-void BookmarkBarBridge::Loaded(BookmarkModel* model, bool ids_reassigned) {
+void BookmarkBarBridge::BookmarkModelLoaded(BookmarkModel* model,
+                                            bool ids_reassigned) {
   [controller_ loaded:model];
 }
 
@@ -65,15 +66,19 @@ void BookmarkBarBridge::BookmarkNodeAdded(BookmarkModel* model,
     [controller_ nodeAdded:model parent:parent index:index];
 }
 
-void BookmarkBarBridge::BookmarkNodeRemoved(BookmarkModel* model,
-                                            const BookmarkNode* parent,
-                                            int old_index,
-                                            const BookmarkNode* node) {
+void BookmarkBarBridge::BookmarkNodeRemoved(
+    BookmarkModel* model,
+    const BookmarkNode* parent,
+    int old_index,
+    const BookmarkNode* node,
+    const std::set<GURL>& removed_urls) {
   if (!batch_mode_)
     [controller_ nodeRemoved:model parent:parent index:old_index];
 }
 
-void BookmarkBarBridge::BookmarkAllNodesRemoved(BookmarkModel* model) {
+void BookmarkBarBridge::BookmarkAllNodesRemoved(
+    BookmarkModel* model,
+    const std::set<GURL>& removed_urls) {
   [controller_ loaded:model];
 }