Action box menu

ui/views/controls/menu/menu_item_view.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef UI_VIEWS_CONTROLS_MENU_MENU_ITEM_VIEW_H_
 #define UI_VIEWS_CONTROLS_MENU_MENU_ITEM_VIEW_H_
 #pragma once
 
 #include <string>
 #include <vector>
@@ skipping 118 matching lines @@
   // Hides and cancels the menu. This does nothing if the menu is not open.
   void Cancel();
 
   // Add an item to the menu at a specified index.  ChildrenChanged() should
   // called after adding menu items if the menu may be active.
   MenuItemView* AddMenuItemAt(int index,
                               int item_id,
                               const string16& label,
                               const gfx::ImageSkia& icon,
                               Type type);
 

[Aaron Boodman, 2012/07/02 22:41:34]

Remove blank line.

[yefimt, 2012/07/11 22:34:34]

It was a merging issue, it should not be here at all, removed

On 2012/07/02 22:41:34, Aaron Boodman wrote:

+  void AddMenuItemAt(int index, MenuItemView* item);
+
   // 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).
   void RemoveMenuItemAt(int index);
 
   // Appends an item to this menu.
   // item_id    The id of the item, used to identify it in delegate callbacks
   //            or (if delegate is NULL) to identify the command associated
   //            with this item with the controller specified in the ctor. Note
   //            that this value should not be 0 as this has a special meaning
@@ skipping 341 matching lines @@
   // If set to false, the right margin will be removed for menu lines
   // containing other elements.
   bool use_right_margin_;
 
   DISALLOW_COPY_AND_ASSIGN(MenuItemView);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_CONTROLS_MENU_MENU_ITEM_VIEW_H_