Update ash shelf/tray focus rects.

ash/common/system/tray/system_menu_button.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/tray/system_menu_button.h"
 
 #include "ash/common/ash_constants.h"
 #include "ash/common/system/tray/system_tray.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/system/tray/tray_popup_utils.h"
@@ skipping 21 matching lines @@
   SetImage(views::Button::STATE_NORMAL, &normal_icon);
   SetImage(views::Button::STATE_DISABLED, &disabled_icon);
 
   const int horizontal_padding = (kMenuButtonSize - normal_icon.width()) / 2;
   const int vertical_padding = (kMenuButtonSize - normal_icon.height()) / 2;
   SetBorder(views::CreateEmptyBorder(vertical_padding, horizontal_padding,
                                      vertical_padding, horizontal_padding));
 
   SetTooltipText(l10n_util::GetStringUTF16(accessible_name_id));
 
-  // TODO(tdanderson): Update the focus rect color, border thickness, and
-  // location for material design.
   SetFocusForPlatform();
   SetFocusPainter(views::Painter::CreateSolidFocusPainter(
-      kFocusBorderColor, gfx::Insets(1, 1, 1, 1)));
+      kFocusBorderColor, kFocusBorderThickness, gfx::InsetsF()));
 
   SetInkDropMode(InkDropMode::ON);
   set_has_ink_drop_action_on_click(true);
   set_ink_drop_base_color(kTrayPopupInkDropBaseColor);
   set_ink_drop_visible_opacity(kTrayPopupInkDropRippleOpacity);
 }
 
 SystemMenuButton::SystemMenuButton(views::ButtonListener* listener,
                                    TrayPopupInkDropStyle ink_drop_style,
                                    const gfx::VectorIcon& icon,
@@ skipping 20 matching lines @@
 SystemMenuButton::CreateInkDropHighlight() const {
   return TrayPopupUtils::CreateInkDropHighlight(ink_drop_style_, this);
 }
 
 std::unique_ptr<views::InkDropMask> SystemMenuButton::CreateInkDropMask()
     const {
   return TrayPopupUtils::CreateInkDropMask(ink_drop_style_, this);
 }
 
 }  // namespace ash