Fix SysTray focus rect position

ash/common/system/tray/tray_background_view.cc

Index: ash/common/system/tray/tray_background_view.cc
diff --git a/ash/common/system/tray/tray_background_view.cc b/ash/common/system/tray/tray_background_view.cc
index 26d7797d3190ec631b3fff426aa36444232bb31f..3caf690427e15307f1f97000ec1f0a3d0c66e178 100644
--- a/ash/common/system/tray/tray_background_view.cc
+++ b/ash/common/system/tray/tray_background_view.cc
@@ -572,12 +572,15 @@ gfx::Rect TrayBackgroundView::GetFocusBounds() {
   // 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();
+  return MaterialDesignController::IsShelfMaterial() ? GetBackgroundBounds()
+                                                     : GetContentsBounds();
 }
 
 void TrayBackgroundView::OnPaintFocus(gfx::Canvas* canvas) {
   gfx::RectF paint_bounds(GetFocusBounds());
-  paint_bounds.Inset(gfx::Insets(2, -2));
+  paint_bounds.Inset(gfx::Insets(MaterialDesignController::IsShelfMaterial()
+                                     ? -kFocusBorderThickness

[Evan Stade, 2016/12/15 17:38:00]

this looks much better, but GetFocusBounds is still confusing. It looks like
it's a virtual function on ActionableView but the override in TrayBackgroundView
is never actually used (in the sense that ActionableView::OnPaintFocus, which
would use the specialization, is also overridden). I think you should be able to
just get rid of GetFocusBounds and calculate the proper bounds in this function
(i.e. GetBackgroundsBounds() and the appropriate inset)

[Greg Levin, 2016/12/15 21:08:57]

Done.  Also got rid of ActionableView::GetFocusBounds(), since it wasn't being
overridden anywhere.

+                                     : 1));
   canvas->DrawSolidFocusRect(paint_bounds, kFocusBorderColor,
                              kFocusBorderThickness);
 }