Added support for icon views (view used instead of icon in a menu item).

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 221 matching lines @@
 
   // Sets the |tooltip| for a menu item view with |item_id| identifier.
   void SetTooltip(const string16& tooltip, int item_id);
 
   // Sets the icon for the descendant identified by item_id.
   void SetIcon(const gfx::ImageSkia& icon, int item_id);
 
   // Sets the icon of this menu item.
   void SetIcon(const gfx::ImageSkia& icon);
 
-  // Returns the icon.
-  const gfx::ImageSkia& GetIcon() const { return icon_; }
+  // Sets the view used to render the icon. This clobbers any icon set via
+  // SetIcon(). MenuItemView takes ownership of |icon_view|.
+  void SetIconView(View* icon_view);
+  View* icon_view() { return icon_view_; }
 
   // Sets the command id of this menu item.
   void SetCommand(int command) { command_ = command; }
 
   // Returns the command id of this item.
   int GetCommand() const { return command_; }
 
   // Paints the menu item.
   virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
 
@@ skipping 26 matching lines @@
   // Returns the descendant with the specified command.
   MenuItemView* GetMenuItemByID(int id);
 
   // Invoke if you remove/add children to the menu while it's showing. This
   // recalculates the bounds.
   void ChildrenChanged();
 
   // Sizes any child views.
   virtual void Layout() OVERRIDE;
 
-  // Returns the amount of space needed to accomodate the accelerator. The
+  // Returns the amount of space needed to accommodate the accelerator. The
   // space needed for the accelerator is NOT included in the preferred width.
   int GetAcceleratorTextWidth();
 
   // Returns true if the menu has mnemonics. This only useful on the root menu
   // item.
   bool has_mnemonics() const { return has_mnemonics_; }
 
   // Set top and bottom margins in pixels.  If no margin is set or a
   // negative margin is specified then MenuConfig values are used.
   void SetMargins(int top_margin, int bottom_margin);
@@ skipping 19 matching lines @@
   virtual void ChildPreferredSizeChanged(View* child) OVERRIDE;
 
   virtual std::string GetClassName() const OVERRIDE;
 
  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);
+  void UpdateMenuPartSizes();
 
   // Called by the two constructors to initialize this menu item.
   void Init(MenuItemView* parent,
             int command,
             MenuItemView::Type type,
             MenuDelegate* delegate);
 
   // The RunXXX methods call into this to set up the necessary state before
   // running.
   void PrepareForRun(bool has_mnemonics, bool show_mnemonics);
@@ skipping 57 matching lines @@
   void set_actual_menu_position(MenuPosition actual_menu_position) {
     actual_menu_position_ = actual_menu_position;
   }
 
   void set_controller(MenuController* controller) { controller_ = controller; }
 
   // Returns true if this MenuItemView contains a single child
   // that is responsible for rendering the content.
   bool IsContainer() const;
 
+  // Returns number if child views excluding icon_view.

[msw, 2012/06/28 01:56:38]

nit: "if"->"of".

[yefimt, 2012/06/28 16:53:34]

Done.

+  int NonIconChildViewsCount() const;
+
+  // Get recursively max icon views width.

[msw, 2012/06/28 01:56:38]

nit: grammar/clarity. Perhaps: "Returns the max icon width; recurses over
submenus."

[yefimt, 2012/06/28 16:53:34]

Done.

+  int GetMaxIconViewWidth() const;
+
   // The delegate. This is only valid for the root menu item. You shouldn't
   // use this directly, instead use GetDelegate() which walks the tree as
   // as necessary.
   MenuDelegate* delegate_;
 
   // The controller for the run operation, or NULL if the menu isn't showing.
   MenuController* controller_;
 
   // Used to detect when Cancel was invoked.
   bool canceled_;
@@ skipping 10 matching lines @@
 
   // Command id.
   int command_;
 
   // Submenu, created via CreateSubmenu.
   SubmenuView* submenu_;
 
   // Title.
   string16 title_;
 
-  // Icon.
-  gfx::ImageSkia icon_;
-
   // Does the title have a mnemonic? Only useful on the root menu item.
   bool has_mnemonics_;
 
   // Should we show the mnemonic? Mnemonics are shown if this is true or
   // MenuConfig says mnemonics should be shown. Only used on the root menu item.
   bool show_mnemonics_;
 
+  // Set if menu has icons or icon_views

[msw, 2012/06/28 01:56:38]

nit: combine comments onto one line or add punctuation on first.

[yefimt, 2012/06/28 16:53:34]

Done.

+  // (applies to root menu item only).
   bool has_icons_;
 
+  // Pointer to a view with a menu icon.
+  View* icon_view_;
+
   // The tooltip to show on hover for this menu item.
   string16 tooltip_;
 
+  // Width of a menu icon area.
+  static int icon_area_width_;
+
   // X-coordinate of where the label starts.
   static int label_start_;
 
   // Margins between the right of the item and the label.
   static int item_right_margin_;
 
   // Preferred height of menu items. Reset every time a menu is run.
   static int pref_menu_height_;
 
   // Previously calculated preferred size to reduce GetStringWidth calls in
@@ skipping 16 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_