ash: Make sure the focus-border in the tray paints correctly, and tray-view should not be focusable

ash/system/tray/tray_views.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/system/tray/tray_views.h"
 
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/tray/tray_item_view.h"
 #include "grit/ash_strings.h"
 #include "grit/ui_resources.h"
@@ skipping 91 matching lines @@
 // ActionableView
 
 ActionableView::ActionableView()
     : has_capture_(false) {
   set_focusable(true);
 }
 
 ActionableView::~ActionableView() {
 }
 
+void ActionableView::DrawBorder(gfx::Canvas* canvas, const gfx::Rect& bounds) {
+  gfx::Rect rect = bounds;
+  rect.Inset(1, 1, 3, 3);
+  canvas->DrawRect(rect, kFocusBorderColor);
+}
+
 bool ActionableView::OnKeyPressed(const views::KeyEvent& event) {
   if (event.key_code() == ui::VKEY_SPACE ||
       event.key_code() == ui::VKEY_RETURN) {
     return PerformAction(event);
   }
   return false;
 }
 
 bool ActionableView::OnMousePressed(const views::MouseEvent& event) {
   // Return true so that this view starts capturing the events.
   has_capture_ = true;
   return true;
 }
 
 void ActionableView::OnMouseReleased(const views::MouseEvent& event) {
   if (has_capture_ && GetLocalBounds().Contains(event.location()))
     PerformAction(event);
 }
 
 void ActionableView::OnMouseCaptureLost() {
   has_capture_ = false;
 }
 
 void ActionableView::SetAccessibleName(const string16& name) {
   accessible_name_ = name;
 }
 
 void ActionableView::OnPaintFocusBorder(gfx::Canvas* canvas) {
-  if (HasFocus() && (focusable() || IsAccessibilityFocusable())) {
-    canvas->DrawRect(gfx::Rect(1, 1, width() - 3, height() - 3),
-                     kFocusBorderColor);
-  }
+  if (HasFocus() && (focusable() || IsAccessibilityFocusable()))
+    DrawBorder(canvas, GetLocalBounds());
 }
 
 ui::GestureStatus ActionableView::OnGestureEvent(
     const views::GestureEvent& event) {
   if (event.type() == ui::ET_GESTURE_TAP) {
     return PerformAction(event) ? ui::GESTURE_STATUS_CONSUMED :
                                   ui::GESTURE_STATUS_UNKNOWN;
   }
   return ui::GESTURE_STATUS_UNKNOWN;
 }
@@ skipping 488 matching lines @@
     tray_view->set_border(views::Border::CreateEmptyBorder(
         kTrayLabelItemVerticalPaddingVeriticalAlignment,
         horizontal_padding,
         kTrayLabelItemVerticalPaddingVeriticalAlignment,
         horizontal_padding));
   }
 }
 
 }  // namespace internal
 }  // namespace ash