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 303 matching lines @@
   // Creates a MenuItemView. This is used by the various AddXXX methods.
   MenuItemView(MenuItemView* parent, int command, Type type);
 
   // MenuRunner owns MenuItemView and should be the only one deleting it.
   virtual ~MenuItemView();
 
   virtual void ChildPreferredSizeChanged(View* child) OVERRIDE;
 
   virtual std::string GetClassName() const OVERRIDE;
 
+  virtual MenuItemView* AllocateMenuItemView(MenuItemView* parent, int item_id,

[Aaron Boodman, 2012/06/12 05:53:44]

You're right, this looks like a funny change.

Instead, can we add MenuItemView::AppendItem(MenuItemView*), and then call that
instead of AppendItemFromModel()?

[yefimt, 2012/06/13 01:24:21]

Done.

+                                             Type type);
+
+  // Returns the various margins.
+  int GetTopMargin();

[Aaron Boodman, 2012/06/12 05:53:44]

This isn't called anywhere. Does it need to be public?

[yefimt, 2012/06/13 01:24:21]

Done.

+  int GetBottomMargin();
+
  private:
   friend class internal::MenuRunnerImpl;  // For access to ~MenuItemView.
 
   // Calculates all sizes that we can from the OS.
   //
   // This is invoked prior to Running a menu.
   static void UpdateMenuPartSizes(bool has_icons);
 
   // Called by the two constructors to initialize this menu item.
   void Init(MenuItemView* parent,
@@ skipping 41 matching lines @@
   // Paints the accelerator.
   void PaintAccelerator(gfx::Canvas* canvas);
 
   // Destroys the window used to display this menu and recursively destroys
   // the windows used to display all descendants.
   void DestroyAllMenuHosts();
 
   // Returns the accelerator text.
   string16 GetAcceleratorText();
 
-  // Returns the various margins.
-  int GetTopMargin();
-  int GetBottomMargin();
-
   // Returns the preferred size (and padding) of any children.
   gfx::Size GetChildPreferredSize();
 
   // Calculates the preferred size.
   gfx::Size CalculatePreferredSize();
 
   // Used by MenuController to cache the menu position in use by the
   // active menu.
   MenuPosition actual_menu_position() const { return actual_menu_position_; }
   void set_actual_menu_position(MenuPosition actual_menu_position) {
@@ skipping 80 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_