[Chrome OS MD] Implement accessibility detailed view for the MD Ash system menu

ash/common/system/chromeos/palette/common_palette_tool.cc

 // Copyright 2016 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 "ash/common/system/chromeos/palette/common_palette_tool.h"
 
 #include "ash/common/shelf/shelf_constants.h"
 #include "ash/common/system/chromeos/palette/palette_ids.h"
 #include "ash/common/system/chromeos/palette/palette_tool_manager.h"
 #include "ash/common/system/tray/hover_highlight_view.h"
+#include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/system/tray/view_click_listener.h"
 #include "base/logging.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "grit/ash_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/gfx/vector_icons_public.h"
 #include "ui/views/border.h"
 
 namespace ash {
 namespace {
 
-// Size of the icons in DP.
-const int kIconSize = 20;
-
-// Distance between the icon and the check from the egdes in DP.
-const int kMarginFromEdges = 14;
-
-// Extra distance between the icon and the left edge in DP.
-const int kExtraMarginFromLeftEdge = 4;
-
-// Distance between the icon and the name of the tool in DP.
-const int kMarginBetweenIconAndText = 18;
-
 void AddHistogramTimes(PaletteToolId id, base::TimeDelta duration) {
   if (id == PaletteToolId::LASER_POINTER) {
     UMA_HISTOGRAM_CUSTOM_TIMES("Ash.Shelf.Palette.InLaserPointerMode", duration,
                                base::TimeDelta::FromMilliseconds(100),
                                base::TimeDelta::FromHours(1), 50);
   } else if (id == PaletteToolId::MAGNIFY) {
     UMA_HISTOGRAM_CUSTOM_TIMES("Ash.Shelf.Palette.InMagnifyMode", duration,
                                base::TimeDelta::FromMilliseconds(100),
                                base::TimeDelta::FromHours(1), 50);
   }
@@ skipping 44 matching lines @@
     delegate()->RecordPaletteModeCancellation(
         PaletteToolIdToPaletteModeCancelType(GetToolId(),
                                              false /*is_switched*/));
   } else {
     delegate()->EnableTool(GetToolId());
   }
 }
 
 views::View* CommonPaletteTool::CreateDefaultView(const base::string16& name) {
   gfx::ImageSkia icon =
-      CreateVectorIcon(GetPaletteIcon(), kIconSize, gfx::kChromeIconGrey);
+      CreateVectorIcon(GetPaletteIcon(), kMenuIconSize, gfx::kChromeIconGrey);
   gfx::ImageSkia check = CreateVectorIcon(gfx::VectorIconId::CHECK_CIRCLE,
-                                          kIconSize, gfx::kGoogleGreen700);
+                                          kMenuIconSize, gfx::kGoogleGreen700);
 
   highlight_view_ = new HoverHighlightView(this);
   highlight_view_->SetBorder(
-      views::Border::CreateEmptyBorder(0, kExtraMarginFromLeftEdge, 0, 0));
-  highlight_view_->AddIconAndLabelCustomSize(icon, name, false, kIconSize,
-                                             kMarginFromEdges,
-                                             kMarginBetweenIconAndText);
-  highlight_view_->AddRightIcon(check, kIconSize);
+      views::Border::CreateEmptyBorder(0, kMenuSeparatorVerticalPadding, 0, 0));
+  const int interior_button_padding = (kMenuButtonSize - kMenuIconSize) / 2;
+  highlight_view_->AddIconAndLabelCustomSize(
+      icon, name, false, kMenuIconSize, interior_button_padding,
+      interior_button_padding + kMenuSeparatorVerticalPadding);
+  highlight_view_->AddRightIcon(check, kMenuIconSize);
 
   if (enabled())
     highlight_view_->SetHighlight(true);
   else
     highlight_view_->SetRightIconVisible(false);
 
   return highlight_view_;
 }
 
 }  // namespace ash