Index: chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc |
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc |
index 8c22e23ec47bd8239474efa60fcf6d7a2c39537c..ddc1aa25734c125e3f902d5100398687d515772f 100644 |
--- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc |
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc |
@@ -541,6 +541,8 @@ bool BookmarkBarView::AreDropTypesRequired() { |
bool BookmarkBarView::CanDrop(const ui::OSExchangeData& data) { |
if (!model_ || !model_->IsLoaded()) |
return false; |
+ if (!profile_->GetPrefs()->GetBoolean(prefs::kEditBookmarksEnabled)) |
sky
2011/04/13 14:28:55
Combine with previous if.
Joao da Silva
2011/04/13 14:42:42
Done.
|
+ return false; |
if (!drop_info_.get()) |
drop_info_.reset(new DropInfo()); |
@@ -1114,7 +1116,7 @@ int BookmarkBarView::GetDragOperationsForView(View* sender, |
for (int i = 0; i < GetBookmarkButtonCount(); ++i) { |
if (sender == GetBookmarkButton(i)) { |
return bookmark_utils::BookmarkDragOperation( |
- model_->GetBookmarkBarNode()->GetChild(i)); |
+ profile_, model_->GetBookmarkBarNode()->GetChild(i)); |
} |
} |
NOTREACHED(); |