Fix SysTray focus rect position

ash/common/system/tray/tray_background_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 "ash/common/system/tray/tray_background_view.h"
 
 #include <algorithm>
 
 #include "ash/common/ash_constants.h"
 #include "ash/common/material_design/material_design_controller.h"
@@ skipping 550 matching lines @@
 }
 
 void TrayBackgroundView::HandlePerformActionResult(bool action_performed,
                                                    const ui::Event& event) {
   // When an action is performed, ink drop ripple is handled in SetIsActive().
   if (action_performed)
     return;
   ActionableView::HandlePerformActionResult(action_performed, event);
 }
 
-gfx::Rect TrayBackgroundView::GetFocusBounds() {
+void TrayBackgroundView::OnPaintFocus(gfx::Canvas* canvas) {
   // The tray itself expands to the right and bottom edge of the screen to make
   // sure clicking on the edges brings up the popup. However, the focus border
   // should be only around the container.
-  return GetContentsBounds();
-}
-
-void TrayBackgroundView::OnPaintFocus(gfx::Canvas* canvas) {
-  gfx::RectF paint_bounds(GetFocusBounds());
-  paint_bounds.Inset(gfx::Insets(2, -2));
+  gfx::RectF paint_bounds(MaterialDesignController::IsShelfMaterial()

[Evan Stade, 2016/12/15 21:53:11]

nit: instead of multiple ternaries I'd just use if/else. I think it's easier to
read and it's also slightly easier to delete when we remove non md code.

[Greg Levin, 2016/12/15 23:46:36]

Heh... I wrote that version, then switched it back when I realized I'd have to
declare and assign |paint_bounds| on separate lines.  I'll fix it when I get to
work tomorrow.  Thanks for all the help!

+                              ? GetBackgroundBounds()
+                              : GetContentsBounds());
+  paint_bounds.Inset(gfx::Insets(MaterialDesignController::IsShelfMaterial()
+                                     ? -kFocusBorderThickness
+                                     : 1));
   canvas->DrawSolidFocusRect(paint_bounds, kFocusBorderColor,
                              kFocusBorderThickness);
 }
 
 void TrayBackgroundView::OnPaint(gfx::Canvas* canvas) {
   ActionableView::OnPaint(canvas);
   if (!MaterialDesignController::IsShelfMaterial() ||
       shelf()->GetBackgroundType() ==
           ShelfBackgroundType::SHELF_BACKGROUND_DEFAULT ||
       !is_separator_visible_) {
@@ skipping 46 matching lines @@
 }
 
 gfx::Rect TrayBackgroundView::GetBackgroundBounds() const {
   gfx::Insets insets = GetBackgroundInsets();
   gfx::Rect bounds = GetLocalBounds();
   bounds.Inset(insets);
   return bounds;
 }
 
 }  // namespace ash