fix layout of requestAutocomplete suggestion dropdown menu on views

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/utf_string_conversions.h"
 #include "grit/ui_resources.h"
@@ skipping 820 matching lines @@
       enabled() ? ui::NativeTheme::kColorId_EnabledMenuItemForegroundColor
           : ui::NativeTheme::kColorId_DisabledMenuItemForegroundColor);
   SkColor override_foreground_color;
   if (delegate && delegate->GetForegroundColor(GetCommand(),
                                                render_selection,
                                                &override_foreground_color))
     fg_color = override_foreground_color;
 
   const gfx::Font& font = GetFont();
   int accel_width = parent_menu_item_->GetSubmenu()->max_accelerator_width();
-  int label_start = label_start_ + left_icon_margin_ + right_icon_margin_;
-  if ((type_ == CHECKBOX || type_ == RADIO) && icon_view_)
-    label_start += icon_view_->size().width() + config.icon_to_label_padding;
+  int label_start = GetLabelStartForThisItem();
 
   int width = this->width() - label_start - accel_width -
       (!delegate ||
        delegate->ShouldReserveSpaceForSubmenuIndicator() ?
            item_right_margin_ : config.arrow_to_edge_padding);
   gfx::Rect text_bounds(label_start, top_margin, width, available_height);
   text_bounds.set_x(GetMirroredXForRect(text_bounds));
   int flags = GetDrawStringFlags();
   if (mode == PB_FOR_DRAG)
     flags |= gfx::Canvas::NO_SUBPIXEL_RENDERING;
@@ skipping 128 matching lines @@
   const MenuDelegate* delegate = GetDelegate();
   if (delegate) {
     delegate->GetHorizontalIconMargins(command_,
                                        icon_area_width_,
                                        &left_icon_margin_,
                                        &right_icon_margin_);
   } else {
     left_icon_margin_ = 0;
     right_icon_margin_ = 0;
   }
-  int label_start = label_start_ + left_icon_margin_ + right_icon_margin_;
+  int label_start = GetLabelStartForThisItem();
 
   dimensions.standard_width = font.GetStringWidth(title_) + label_start +
       item_right_margin_;
   // Determine the length of the accelerator text.
   string16 text = GetAcceleratorText();
   dimensions.accelerator_width =
       text.empty() ? 0 : GetFont().GetStringWidth(text);
 
   // Determine the height to use.
   dimensions.height = std::max(dimensions.height,
       font.GetHeight() + GetBottomMargin() + GetTopMargin());
   dimensions.height = std::max(dimensions.height,
       GetMenuConfig().item_min_height);
   return dimensions;
 }
 
+int MenuItemView::GetLabelStartForThisItem() {
+  int label_start = label_start_ + left_icon_margin_ + right_icon_margin_;
+  if ((type_ == CHECKBOX || type_ == RADIO) && icon_view_) {
+    label_start += icon_view_->size().width() +
+        GetMenuConfig().icon_to_label_padding;
+  }
+  return label_start;
+}
+
 string16 MenuItemView::GetAcceleratorText() {
   if (id() == kEmptyMenuItemViewID) {
     // Don't query the delegate for menus that represent no children.
     return string16();
   }
 
   if(!GetMenuConfig().show_accelerators)
     return string16();
 
   ui::Accelerator accelerator;
@@ skipping 38 matching lines @@
     } else {
       const Type& type = menu_item->GetType();
       if (type == CHECKBOX || type == RADIO)
         return true;
     }
   }
   return false;
 }
 
 }  // namespace views