Limit access to ChromeBookmarkClient to bookmarks code

chrome/browser/ui/bookmarks/bookmark_utils.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/bookmarks/bookmark_utils.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 369 matching lines @@
 }
 
 int GetBookmarkDragOperation(content::BrowserContext* browser_context,
                              const BookmarkNode* node) {
   PrefService* prefs = user_prefs::UserPrefs::Get(browser_context);
   Profile* profile = Profile::FromBrowserContext(browser_context);
   BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile);
 
   int move = ui::DragDropTypes::DRAG_MOVE;
   if (!prefs->GetBoolean(bookmarks::prefs::kEditBookmarksEnabled) ||
-      !model->client()->CanBeEditedByUser(node)) {
+      !model->CanBeEditedByUser(node)) {
     move = ui::DragDropTypes::DRAG_NONE;
   }
   if (node->is_url())
     return ui::DragDropTypes::DRAG_COPY | ui::DragDropTypes::DRAG_LINK | move;
   return ui::DragDropTypes::DRAG_COPY | move;
 }
 
 int GetPreferredBookmarkDropOperation(int source_operations, int operations) {
   int common_ops = (source_operations & operations);
   if (!common_ops)
@@ skipping 15 matching lines @@
   const base::FilePath& profile_path = profile->GetPath();
 
   if (data.IsFromProfilePath(profile_path) && data.size() > 1)
     // Currently only accept one dragged node at a time.
     return ui::DragDropTypes::DRAG_NONE;
 
   if (!IsValidBookmarkDropLocation(profile, data, parent, index))
     return ui::DragDropTypes::DRAG_NONE;
 
   BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile);
-  if (!model->client()->CanBeEditedByUser(parent))
+  if (!model->CanBeEditedByUser(parent))
     return ui::DragDropTypes::DRAG_NONE;
 
   const BookmarkNode* dragged_node =
       data.GetFirstNode(model, profile->GetPath());
   if (dragged_node) {
     // User is dragging from this profile.
-    if (!model->client()->CanBeEditedByUser(dragged_node)) {
+    if (!model->CanBeEditedByUser(dragged_node)) {
       // Do a copy instead of a move when dragging bookmarks that the user can't
       // modify.
       return ui::DragDropTypes::DRAG_COPY;
     }
     return ui::DragDropTypes::DRAG_MOVE;
   }
 
   // User is dragging from another app, copy.
   return GetPreferredBookmarkDropOperation(event.source_operations(),
       ui::DragDropTypes::DRAG_COPY | ui::DragDropTypes::DRAG_LINK);
 }
 
 bool IsValidBookmarkDropLocation(Profile* profile,
                                  const bookmarks::BookmarkNodeData& data,
                                  const BookmarkNode* drop_parent,
                                  int index) {
   if (!drop_parent->is_folder()) {
     NOTREACHED();
     return false;
   }
 
   if (!data.is_valid())
     return false;
 
   BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile);
-  if (!model->client()->CanBeEditedByUser(drop_parent))
+  if (!model->CanBeEditedByUser(drop_parent))
     return false;
 
   const base::FilePath& profile_path = profile->GetPath();
   if (data.IsFromProfilePath(profile_path)) {
     std::vector<const BookmarkNode*> nodes = data.GetNodes(model, profile_path);
     for (size_t i = 0; i < nodes.size(); ++i) {
       // Don't allow the drop if the user is attempting to drop on one of the
       // nodes being dragged.
       const BookmarkNode* node = nodes[i];
       int node_index = (drop_parent == node->parent()) ?
           drop_parent->GetIndexOf(nodes[i]) : -1;
       if (node_index != -1 && (index == node_index || index == node_index + 1))
         return false;
 
       // drop_parent can't accept a child that is an ancestor.
       if (drop_parent->HasAncestor(node))
         return false;
     }
     return true;
   }
   // From another profile, always accept.
   return true;
 }
 
 }  // namespace chrome