Update ash shelf/tray focus rects.

ash/common/system/user/button_from_view.cc

 // Copyright 2014 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 <vector>
 
 #include "ash/common/system/user/button_from_view.h"
 
 #include "ash/common/ash_constants.h"
 #include "ash/common/material_design/material_design_controller.h"
@@ skipping 71 matching lines @@
 
 void ButtonFromView::OnMouseExited(const ui::MouseEvent& event) {
   button_hovered_ = false;
   ShowActive();
 }
 
 void ButtonFromView::OnPaint(gfx::Canvas* canvas) {
   View::OnPaint(canvas);
   if (HasFocus()) {
     gfx::RectF rect(GetLocalBounds());
-    if (MaterialDesignController::IsSystemTrayMenuMaterial())
-      rect.Inset(gfx::InsetsF(0.5f));
-    else
+    bool use_md = MaterialDesignController::IsSystemTrayMenuMaterial();
+    if (!use_md)
       rect.Inset(gfx::InsetsF(tab_frame_inset_));
-    canvas->DrawSolidFocusRect(rect, kFocusBorderColor);
+    canvas->DrawSolidFocusRect(rect, kFocusBorderColor,
+                               use_md ? kFocusBorderThickness : 1);
   }
 }
 
 void ButtonFromView::OnFocus() {
   View::OnFocus();
   // Adding focus frame.
   SchedulePaint();
 }
 
 void ButtonFromView::OnBlur() {
@@ skipping 67 matching lines @@
         button_hovered_ ? kHoverBackgroundColor : kBackgroundColor;
     content_->set_background(
         views::Background::CreateSolidBackground(background_color));
     set_background(views::Background::CreateSolidBackground(background_color));
   }
   SchedulePaint();
 }
 
 }  // namespace tray
 }  // namespace ash