Update ash shelf/tray focus rects.

ash/common/system/tray/tray_popup_utils.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/tray_popup_utils.h"
 
 #include "ash/common/ash_constants.h"
 #include "ash/common/ash_view_ids.h"
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/session/session_state_delegate.h"
@@ skipping 99 matching lines @@
       : LabelButton(listener, text) {
     if (MaterialDesignController::IsSystemTrayMenuMaterial()) {
       SetInkDropMode(views::InkDropHostView::InkDropMode::ON);
       set_has_ink_drop_action_on_click(true);
       set_ink_drop_base_color(kTrayPopupInkDropBaseColor);
       set_ink_drop_visible_opacity(kTrayPopupInkDropRippleOpacity);
       const int kHorizontalPadding = 20;
       SetBorder(views::CreateEmptyBorder(gfx::Insets(0, kHorizontalPadding)));
       TrayPopupItemStyle style(TrayPopupItemStyle::FontStyle::BUTTON);
       style.SetupLabel(label());
-      // TODO(tdanderson): Update focus rect for material design. See
-      // crbug.com/615892
-      // Hack alert: CreateSolidFocusPainter should add 0.5f to all insets to
-      // make the lines align to pixel centers, but for now it doesn't. We can
-      // get around this by relying on Skia rounding up integer coordinates.
-      SetFocusPainter(views::Painter::CreateSolidFocusPainter(
-          kFocusBorderColor, gfx::Insets(0, 0, 1, 1)));
+      SetFocusPainter(TrayPopupUtils::CreateFocusPainter());
     } else {
       SetBorder(std::unique_ptr<views::Border>(new TrayPopupLabelButtonBorder));
       SetFocusPainter(views::Painter::CreateSolidFocusPainter(
           kFocusBorderColor, gfx::Insets(1, 1, 2, 2)));
       set_animate_on_state_change(false);
     }
     SetHorizontalAlignment(gfx::ALIGN_CENTER);
     SetFocusForPlatform();
   }
 
@@ skipping 111 matching lines @@
   views::ImageView* image =
       new FixedSizedImageView(GetTrayConstant(TRAY_POPUP_ITEM_MORE_IMAGE_SIZE),
                               GetTrayConstant(TRAY_POPUP_ITEM_MORE_IMAGE_SIZE));
   image->EnableCanvasFlippingForRTLUI(true);
   return image;
 }
 
 views::Slider* TrayPopupUtils::CreateSlider(views::SliderListener* listener) {
   const bool is_material = MaterialDesignController::IsSystemTrayMenuMaterial();
   views::Slider* slider = views::Slider::CreateSlider(is_material, listener);
-  slider->set_focus_border_color(kFocusBorderColor);
   if (is_material) {
     slider->SetBorder(
         views::CreateEmptyBorder(gfx::Insets(0, kTrayPopupSliderPaddingMD)));
   } else {
     slider->SetBorder(
         views::CreateEmptyBorder(0, 0, 0, kTrayPopupPaddingBetweenItems));
   }
   return slider;
 }
 
 views::ToggleButton* TrayPopupUtils::CreateToggleButton(
     views::ButtonListener* listener,
     int accessible_name_id) {
   views::ToggleButton* toggle = new views::ToggleButton(listener);
   const gfx::Size toggle_size(toggle->GetPreferredSize());
   const int vertical_padding = (kMenuButtonSize - toggle_size.height()) / 2;
   const int horizontal_padding =
       (kTrayToggleButtonWidth - toggle_size.width()) / 2;
   toggle->SetBorder(views::CreateEmptyBorder(
       gfx::Insets(vertical_padding, horizontal_padding)));
-  // TODO(tdanderson): Update the focus rect color, border thickness, and
-  // location for material design.
-  toggle->SetFocusPainter(views::Painter::CreateSolidFocusPainter(
-      kFocusBorderColor, gfx::Insets(1)));
+  // TODO(varkha): remove this and implement toggle-button specific focus. See
+  // crbug.com/669124
+  toggle->SetFocusPainter(CreateFocusPainter());
   toggle->SetAccessibleName(l10n_util::GetStringUTF16(accessible_name_id));
   return toggle;
 }
 
+std::unique_ptr<views::Painter> TrayPopupUtils::CreateFocusPainter() {
+  return views::Painter::CreateSolidFocusPainter(
+      kFocusBorderColor, kFocusBorderThickness, gfx::InsetsF());
+}
+
 void TrayPopupUtils::ConfigureAsStickyHeader(views::View* view) {
   view->set_id(VIEW_ID_STICKY_HEADER);
   view->set_background(
       views::Background::CreateSolidBackground(kBackgroundColor));
   view->SetBorder(
       views::CreateEmptyBorder(gfx::Insets(kMenuSeparatorVerticalPadding, 0)));
 }
 
 void TrayPopupUtils::ConfigureContainer(TriView::Container container,
                                         views::View* container_view) {
@@ skipping 159 matching lines @@
 bool TrayPopupUtils::CanOpenWebUISettings(LoginStatus status) {
   // TODO(tdanderson): Consider moving this into WmShell, or introduce a
   // CanShowSettings() method in each delegate type that has a
   // ShowSettings() method.
   return status != LoginStatus::NOT_LOGGED_IN &&
          status != LoginStatus::LOCKED &&
          !WmShell::Get()->GetSessionStateDelegate()->IsInSecondaryLoginScreen();
 }
 
 }  // namespace ash