diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-03 00:35:06 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-03 00:35:06 +0000 |
| commit | 635a29b03e79e9cececd0c23b1cf6907e4956413 (patch) | |
| tree | c4288d41161f23f16c2745e7c125b3c2e2082e3f /ui/views | |
| parent | e3a9ccfc70c99db0dd85be51e4c096d63f8a29bd (diff) | |
| download | chromium_src-635a29b03e79e9cececd0c23b1cf6907e4956413.zip chromium_src-635a29b03e79e9cececd0c23b1cf6907e4956413.tar.gz chromium_src-635a29b03e79e9cececd0c23b1cf6907e4956413.tar.bz2 | |
Minor cleanup of maps used by BookmarkMenuDelegate. NodeToMenuIDMap
and NodeToMenuMap overlap so I nuked NodeToMenuIDMap. Also cleaned up
a couple of other random comments.
BUG=none
TEST=cleanup, covered by existing tests
R=ben@chromium.org
Review URL: https://chromiumcodereview.appspot.com/16105011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203653 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views')
| -rw-r--r-- | ui/views/controls/menu/menu_delegate.h | 8 | ||||
| -rw-r--r-- | ui/views/controls/menu/menu_item_view.h | 5 |
2 files changed, 6 insertions, 7 deletions
diff --git a/ui/views/controls/menu/menu_delegate.h b/ui/views/controls/menu/menu_delegate.h index 3f9fd44..ebce831 100644 --- a/ui/views/controls/menu/menu_delegate.h +++ b/ui/views/controls/menu/menu_delegate.h @@ -165,11 +165,11 @@ class VIEWS_EXPORT MenuDelegate { const ui::DropTargetEvent& event, DropPosition* position); - // Invoked to perform the drop operation. This is ONLY invoked if - // canDrop returned true for the parent menu item, and GetDropOperation - // returned an operation other than ui::DragDropTypes::DRAG_NONE. + // Invoked to perform the drop operation. This is ONLY invoked if CanDrop() + // returned true for the parent menu item, and GetDropOperation() returned an + // operation other than ui::DragDropTypes::DRAG_NONE. // - // menu indicates the menu the drop occurred on. + // |menu| is the menu the drop occurred on. virtual int OnPerformDrop(MenuItemView* menu, DropPosition position, const ui::DropTargetEvent& event); diff --git a/ui/views/controls/menu/menu_item_view.h b/ui/views/controls/menu/menu_item_view.h index d60dd31..2e9eba1 100644 --- a/ui/views/controls/menu/menu_item_view.h +++ b/ui/views/controls/menu/menu_item_view.h @@ -167,9 +167,8 @@ class VIEWS_EXPORT MenuItemView : public View { Type type, ui::MenuSeparatorType separator_style); - // Remove an item from the menu at a specified index. - // ChildrenChanged() should be called after removing menu items (whether - // the menu may be active or not). + // Remove an item from the menu at a specified index. The removed MenuItemView + // is deleted when ChildrenChanged() is invoked. void RemoveMenuItemAt(int index); // Appends an item to this menu. |