cros: adjust touchable icon to label padding

specs: https://screenshot.googleplex.com/zQNSgJP0d7d

Bug: 793155
Test: manual
Change-Id: Ic431bfd18f79c9c036007dadbbfe9a08a3c236c6
Reviewed-on: https://chromium-review.googlesource.com/1055792Reviewed-by: Michael Wasserman <msw@chromium.org>
Reviewed-by: Alex Newcomer <newcomer@chromium.org>
Commit-Queue: Qiang Xu <warx@google.com>
Cr-Commit-Position: refs/heads/master@{#558027}

ui/views/controls/menu/menu_config.cc

@@ -27,7 +27,7 @@ MenuConfig::MenuConfig()
       label_to_arrow_padding(10),
       arrow_to_edge_padding(5),
       icon_to_label_padding(10),
-      touchable_icon_to_label_padding(22),
+      touchable_icon_to_label_padding(16),
       touchable_icon_size(20),
       touchable_icon_color(SkColorSetRGB(0x5F, 0x63, 0x60)),
       check_width(kMenuCheckSize),

ui/views/controls/menu/menu_item_view.cc

@@ -721,7 +721,11 @@ void MenuItemView::UpdateMenuPartSizes() {
   if (has_icons_)
     icon_area_width_ = std::max(icon_area_width_, GetMaxIconViewWidth());
 
-  label_start_ = config.item_left_margin + icon_area_width_;
+  const bool use_touchable_layout =
+      GetMenuController() && GetMenuController()->use_touchable_layout();
+  label_start_ = (use_touchable_layout ? config.touchable_item_left_margin
+                                       : config.item_left_margin) +
+                 icon_area_width_;
   int padding = 0;
   if (config.always_use_icon_to_label_padding) {
     padding = config.icon_to_label_padding;
@@ -729,7 +733,7 @@ void MenuItemView::UpdateMenuPartSizes() {
     padding = (has_icons_ || HasChecksOrRadioButtons()) ?
         config.icon_to_label_padding : 0;
   }
-  if (GetMenuController() && GetMenuController()->use_touchable_layout())
+  if (use_touchable_layout)
     padding = config.touchable_icon_to_label_padding;
 
   label_start_ += padding;