views menus: fix alignment of items that have both checks and icons

ui/views/controls/menu/menu_item_view.cc

 // 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.
 
 #include "ui/views/controls/menu/menu_item_view.h"
 
 #include "base/i18n/case_conversion.h"
 #include "base/stl_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "grit/ui_resources.h"
@@ skipping 1019 matching lines @@
   // Note that what child_count() returns is the number of children,
   // not the number of menu items.
   return child_count() - (icon_view_ ? 1 : 0);
 }
 
 int MenuItemView::GetMaxIconViewWidth() const {
   int width = 0;
   for (int i = 0; i < submenu_->GetMenuItemCount(); ++i) {
     MenuItemView* menu_item = submenu_->GetMenuItemAt(i);
     int temp_width = 0;
-    if (menu_item->HasSubmenu()) {
+    if (menu_item->GetType() == CHECKBOX ||
+        menu_item->GetType() == RADIO) {
+      // If this item has a radio or checkbox, the icon will not affect
+      // alignment of other items.
+      continue;
+    } else if (menu_item->HasSubmenu()) {
       temp_width = menu_item->GetMaxIconViewWidth();
     } else if (menu_item->icon_view()) {
       temp_width = menu_item->icon_view()->GetPreferredSize().width();
     }
     width = std::max(width, temp_width);
   }
   return width;
 }
 
 bool MenuItemView::HasChecksOrRadioButtons() const {
   for (int i = 0; i < submenu_->GetMenuItemCount(); ++i) {
     MenuItemView* menu_item = submenu_->GetMenuItemAt(i);
     if (menu_item->HasSubmenu()) {
       if (menu_item->HasChecksOrRadioButtons())
         return true;
     } else {
       const Type& type = menu_item->GetType();
       if (type == CHECKBOX || type == RADIO)
         return true;
     }
   }
   return false;
 }
 
 }  // namespace views