Multi-Profiles: Add icon chooser to profiles menu

views/controls/menu/menu_item_view.h

 // Copyright (c) 2011 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 VIEWS_CONTROLS_MENU_MENU_ITEM_VIEW_H_
 #define VIEWS_CONTROLS_MENU_MENU_ITEM_VIEW_H_
 #pragma once
 
 #include <string>
 #include <vector>
@@ skipping 388 matching lines @@
   // 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 width (and padding) of any children.
-  int GetChildPreferredWidth();
+  // 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) {
     actual_menu_position_ = actual_menu_position;
   }
@@ skipping 72 matching lines @@
   // position of the menu being shown.
   MenuPosition requested_menu_position_;
   MenuPosition actual_menu_position_;
 
   DISALLOW_COPY_AND_ASSIGN(MenuItemView);
 };
 
 }  // namespace views
 
 #endif  // VIEWS_CONTROLS_MENU_MENU_ITEM_VIEW_H_