Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.h" | 5 #include "chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.h" |
| 6 | 6 |
| 7 #include "base/stl_util-inl.h" | 7 #include "base/stl_util-inl.h" |
| 8 #include "base/utf_string_conversions.h" | 8 #include "base/utf_string_conversions.h" |
| 9 #include "chrome/browser/bookmarks/bookmark_model.h" | 9 #include "chrome/browser/bookmarks/bookmark_model.h" |
| 10 #include "chrome/browser/bookmarks/bookmark_node_data.h" | 10 #include "chrome/browser/bookmarks/bookmark_node_data.h" |
| 11 #include "chrome/browser/bookmarks/bookmark_utils.h" | 11 #include "chrome/browser/bookmarks/bookmark_utils.h" |
| 12 #include "chrome/browser/metrics/user_metrics.h" | 12 #include "chrome/browser/metrics/user_metrics.h" |
| 13 #include "chrome/browser/prefs/pref_service.h" | |
| 13 #include "chrome/browser/profiles/profile.h" | 14 #include "chrome/browser/profiles/profile.h" |
| 14 #include "chrome/browser/ui/browser.h" | 15 #include "chrome/browser/ui/browser.h" |
| 15 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h" | 16 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h" |
| 16 #include "chrome/browser/ui/views/event_utils.h" | 17 #include "chrome/browser/ui/views/event_utils.h" |
| 18 #include "chrome/common/pref_names.h" | |
| 17 #include "content/browser/tab_contents/page_navigator.h" | 19 #include "content/browser/tab_contents/page_navigator.h" |
| 18 #include "content/common/page_transition_types.h" | 20 #include "content/common/page_transition_types.h" |
| 19 #include "grit/app_resources.h" | 21 #include "grit/app_resources.h" |
| 20 #include "grit/generated_resources.h" | 22 #include "grit/generated_resources.h" |
| 21 #include "grit/theme_resources.h" | 23 #include "grit/theme_resources.h" |
| 22 #include "ui/base/dragdrop/os_exchange_data.h" | 24 #include "ui/base/dragdrop/os_exchange_data.h" |
| 23 #include "ui/base/resource/resource_bundle.h" | 25 #include "ui/base/resource/resource_bundle.h" |
| 24 #include "views/controls/button/menu_button.h" | 26 #include "views/controls/button/menu_button.h" |
| 25 | 27 |
| 26 using views::MenuItemView; | 28 using views::MenuItemView; |
| (...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 130 } | 132 } |
| 131 | 133 |
| 132 bool BookmarkMenuController::CanDrop(MenuItemView* menu, | 134 bool BookmarkMenuController::CanDrop(MenuItemView* menu, |
| 133 const ui::OSExchangeData& data) { | 135 const ui::OSExchangeData& data) { |
| 134 // Only accept drops of 1 node, which is the case for all data dragged from | 136 // Only accept drops of 1 node, which is the case for all data dragged from |
| 135 // bookmark bar and menus. | 137 // bookmark bar and menus. |
| 136 | 138 |
| 137 if (!drop_data_.Read(data) || drop_data_.elements.size() != 1) | 139 if (!drop_data_.Read(data) || drop_data_.elements.size() != 1) |
| 138 return false; | 140 return false; |
| 139 | 141 |
| 142 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.
| |
| 143 return false; | |
| 144 | |
| 140 if (drop_data_.has_single_url()) | 145 if (drop_data_.has_single_url()) |
| 141 return true; | 146 return true; |
| 142 | 147 |
| 143 const BookmarkNode* drag_node = drop_data_.GetFirstNode(profile_); | 148 const BookmarkNode* drag_node = drop_data_.GetFirstNode(profile_); |
| 144 if (!drag_node) { | 149 if (!drag_node) { |
| 145 // Dragging a folder from another profile, always accept. | 150 // Dragging a folder from another profile, always accept. |
| 146 return true; | 151 return true; |
| 147 } | 152 } |
| 148 | 153 |
| 149 // Drag originated from same profile and is not a URL. Only accept it if | 154 // Drag originated from same profile and is not a URL. Only accept it if |
| (...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 234 DCHECK(sender && data); | 239 DCHECK(sender && data); |
| 235 | 240 |
| 236 UserMetrics::RecordAction(UserMetricsAction("BookmarkBar_DragFromFolder"), | 241 UserMetrics::RecordAction(UserMetricsAction("BookmarkBar_DragFromFolder"), |
| 237 profile_); | 242 profile_); |
| 238 | 243 |
| 239 BookmarkNodeData drag_data(menu_id_to_node_map_[sender->GetCommand()]); | 244 BookmarkNodeData drag_data(menu_id_to_node_map_[sender->GetCommand()]); |
| 240 drag_data.Write(profile_, data); | 245 drag_data.Write(profile_, data); |
| 241 } | 246 } |
| 242 | 247 |
| 243 int BookmarkMenuController::GetDragOperations(MenuItemView* sender) { | 248 int BookmarkMenuController::GetDragOperations(MenuItemView* sender) { |
| 244 return bookmark_utils::BookmarkDragOperation( | 249 return bookmark_utils::BookmarkDragOperation(profile_, |
| 245 menu_id_to_node_map_[sender->GetCommand()]); | 250 menu_id_to_node_map_[sender->GetCommand()]); |
| 246 } | 251 } |
| 247 | 252 |
| 248 views::MenuItemView* BookmarkMenuController::GetSiblingMenu( | 253 views::MenuItemView* BookmarkMenuController::GetSiblingMenu( |
| 249 views::MenuItemView* menu, | 254 views::MenuItemView* menu, |
| 250 const gfx::Point& screen_point, | 255 const gfx::Point& screen_point, |
| 251 views::MenuItemView::AnchorPosition* anchor, | 256 views::MenuItemView::AnchorPosition* anchor, |
| 252 bool* has_mnemonics, | 257 bool* has_mnemonics, |
| 253 views::MenuButton** button) { | 258 views::MenuButton** button) { |
| 254 if (!bookmark_bar_ || for_drop_) | 259 if (!bookmark_bar_ || for_drop_) |
| (...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 418 break; | 423 break; |
| 419 } | 424 } |
| 420 } | 425 } |
| 421 if (ancestor_removed) { | 426 if (ancestor_removed) { |
| 422 node_to_menu_id_map_.erase(i++); | 427 node_to_menu_id_map_.erase(i++); |
| 423 } else { | 428 } else { |
| 424 ++i; | 429 ++i; |
| 425 } | 430 } |
| 426 } | 431 } |
| 427 } | 432 } |
| OLD | NEW |