Chromium Code Reviews| Index: chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.cc |
| diff --git a/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.cc b/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.cc |
| index f2907d7e96aad53f2ef6f1b959fd85b49a0ffeba..35ce5b72e202ab126b3976f40c840d1def9bf6ec 100644 |
| --- a/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.cc |
| +++ b/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.cc |
| @@ -10,10 +10,12 @@ |
| #include "chrome/browser/bookmarks/bookmark_node_data.h" |
| #include "chrome/browser/bookmarks/bookmark_utils.h" |
| #include "chrome/browser/metrics/user_metrics.h" |
| +#include "chrome/browser/prefs/pref_service.h" |
| #include "chrome/browser/profiles/profile.h" |
| #include "chrome/browser/ui/browser.h" |
| #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h" |
| #include "chrome/browser/ui/views/event_utils.h" |
| +#include "chrome/common/pref_names.h" |
| #include "content/browser/tab_contents/page_navigator.h" |
| #include "content/common/page_transition_types.h" |
| #include "grit/app_resources.h" |
| @@ -137,6 +139,9 @@ bool BookmarkMenuController::CanDrop(MenuItemView* menu, |
| if (!drop_data_.Read(data) || drop_data_.elements.size() != 1) |
| 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_data_.has_single_url()) |
| return true; |
| @@ -241,7 +246,7 @@ void BookmarkMenuController::WriteDragData(MenuItemView* sender, |
| } |
| int BookmarkMenuController::GetDragOperations(MenuItemView* sender) { |
| - return bookmark_utils::BookmarkDragOperation( |
| + return bookmark_utils::BookmarkDragOperation(profile_, |
| menu_id_to_node_map_[sender->GetCommand()]); |
| } |