Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(150)

Side by Side Diff: chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc

Issue 10824295: Rid the world of the last of views::Event types: TouchEvent, GestureEvent, MouseWheelEvent, ScrollE… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_delegate.h" 5 #include "chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.h"
6 6
7 #include "base/utf_string_conversions.h" 7 #include "base/utf_string_conversions.h"
8 #include "chrome/browser/bookmarks/bookmark_model.h" 8 #include "chrome/browser/bookmarks/bookmark_model.h"
9 #include "chrome/browser/bookmarks/bookmark_model_factory.h" 9 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
10 #include "chrome/browser/bookmarks/bookmark_node_data.h" 10 #include "chrome/browser/bookmarks/bookmark_node_data.h"
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after
175 } 175 }
176 const BookmarkNode* drop_node = menu_id_to_node_map_[menu->GetCommand()]; 176 const BookmarkNode* drop_node = menu_id_to_node_map_[menu->GetCommand()];
177 DCHECK(drop_node); 177 DCHECK(drop_node);
178 while (drop_node && drop_node != drag_node) 178 while (drop_node && drop_node != drag_node)
179 drop_node = drop_node->parent(); 179 drop_node = drop_node->parent();
180 return (drop_node == NULL); 180 return (drop_node == NULL);
181 } 181 }
182 182
183 int BookmarkMenuDelegate::GetDropOperation( 183 int BookmarkMenuDelegate::GetDropOperation(
184 MenuItemView* item, 184 MenuItemView* item,
185 const views::DropTargetEvent& event, 185 const ui::DropTargetEvent& event,
186 views::MenuDelegate::DropPosition* position) { 186 views::MenuDelegate::DropPosition* position) {
187 // Should only get here if we have drop data. 187 // Should only get here if we have drop data.
188 DCHECK(drop_data_.is_valid()); 188 DCHECK(drop_data_.is_valid());
189 189
190 const BookmarkNode* node = menu_id_to_node_map_[item->GetCommand()]; 190 const BookmarkNode* node = menu_id_to_node_map_[item->GetCommand()];
191 const BookmarkNode* drop_parent = node->parent(); 191 const BookmarkNode* drop_parent = node->parent();
192 int index_to_drop_at = drop_parent->GetIndexOf(node); 192 int index_to_drop_at = drop_parent->GetIndexOf(node);
193 switch (*position) { 193 switch (*position) {
194 case views::MenuDelegate::DROP_AFTER: 194 case views::MenuDelegate::DROP_AFTER:
195 if (node == BookmarkModelFactory::GetForProfile( 195 if (node == BookmarkModelFactory::GetForProfile(
(...skipping 24 matching lines...) Expand all
220 break; 220 break;
221 } 221 }
222 DCHECK(drop_parent); 222 DCHECK(drop_parent);
223 return bookmark_utils::BookmarkDropOperation( 223 return bookmark_utils::BookmarkDropOperation(
224 profile_, event, drop_data_, drop_parent, index_to_drop_at); 224 profile_, event, drop_data_, drop_parent, index_to_drop_at);
225 } 225 }
226 226
227 int BookmarkMenuDelegate::OnPerformDrop( 227 int BookmarkMenuDelegate::OnPerformDrop(
228 MenuItemView* menu, 228 MenuItemView* menu,
229 views::MenuDelegate::DropPosition position, 229 views::MenuDelegate::DropPosition position,
230 const views::DropTargetEvent& event) { 230 const ui::DropTargetEvent& event) {
231 const BookmarkNode* drop_node = menu_id_to_node_map_[menu->GetCommand()]; 231 const BookmarkNode* drop_node = menu_id_to_node_map_[menu->GetCommand()];
232 DCHECK(drop_node); 232 DCHECK(drop_node);
233 BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile_); 233 BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile_);
234 DCHECK(model); 234 DCHECK(model);
235 const BookmarkNode* drop_parent = drop_node->parent(); 235 const BookmarkNode* drop_parent = drop_node->parent();
236 DCHECK(drop_parent); 236 DCHECK(drop_parent);
237 int index_to_drop_at = drop_parent->GetIndexOf(drop_node); 237 int index_to_drop_at = drop_parent->GetIndexOf(drop_node);
238 switch (position) { 238 switch (position) {
239 case views::MenuDelegate::DROP_AFTER: 239 case views::MenuDelegate::DROP_AFTER:
240 index_to_drop_at++; 240 index_to_drop_at++;
(...skipping 250 matching lines...) Expand 10 before | Expand all | Expand 10 after
491 MenuItemView* BookmarkMenuDelegate::GetMenuByID(int id) { 491 MenuItemView* BookmarkMenuDelegate::GetMenuByID(int id) {
492 for (NodeToMenuMap::const_iterator i(node_to_menu_map_.begin()); 492 for (NodeToMenuMap::const_iterator i(node_to_menu_map_.begin());
493 i != node_to_menu_map_.end(); ++i) { 493 i != node_to_menu_map_.end(); ++i) {
494 MenuItemView* menu = i->second->GetMenuItemByID(id); 494 MenuItemView* menu = i->second->GetMenuItemByID(id);
495 if (menu) 495 if (menu)
496 return menu; 496 return menu;
497 } 497 }
498 498
499 return parent_menu_item_ ? parent_menu_item_->GetMenuItemByID(id) : NULL; 499 return parent_menu_item_ ? parent_menu_item_->GetMenuItemByID(id) : NULL;
500 } 500 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.h ('k') | chrome/browser/ui/views/browser_actions_container.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698