ash: Show better focus rects for the tray.

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 "third_party/skia/include/core/SkBitmap.h"
 #include "grit/ash_strings.h"
 #include "grit/ui_resources.h"
@@ skipping 47 matching lines @@
       event.key_code() == ui::VKEY_RETURN) {
     return PerformAction(event);
   }
   return false;
 }
 
 bool ActionableView::OnMousePressed(const views::MouseEvent& event) {
   return PerformAction(event);
 }
 
+void ActionableView::OnPaintFocusBorder(gfx::Canvas* canvas) {
+  if (HasFocus() && (focusable() || IsAccessibilityFocusable())) {
+    canvas->DrawRect(gfx::Rect(1, 1, width() - 3, height() - 3),
+                     kFocusBorderColor);
+  }
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // HoverHighlightView
 
 HoverHighlightView::HoverHighlightView(ViewClickListener* listener)
     : listener_(listener),
       highlight_color_(kHoverBackgroundColor),
       default_color_(0),
       hover_(false) {
   set_notify_enter_exit_on_child(true);
 }
@@ skipping 91 matching lines @@
   // TODO(sad): This is done to make sure that the scroll view scrolls on
   // mouse-wheel events. This is ugly, and Ben thinks this is weird. There
   // should be a better fix for this.
   RequestFocus();
 }
 
 void FixedSizedScrollView::OnPaintFocusBorder(gfx::Canvas* canvas) {
   // Do not paint the focus border.
 }
 
+////////////////////////////////////////////////////////////////////////////////
+// AccessibleSlider
+
+AccessibleSlider::AccessibleSlider(views::SliderListener* listener,
+                                   views::Slider::Orientation orientation)
+    : views::Slider(listener, orientation) {
+  // Add enough padding on all sides to make sure the focus border does not
+  // overlap the slider.
+  set_border(views::Border::CreateEmptyBorder(3, 3, 3, 3));
+}
+
+AccessibleSlider::~AccessibleSlider() {
+}
+
+void AccessibleSlider::OnPaintFocusBorder(gfx::Canvas* canvas) {
+  if (HasFocus() && (focusable() || IsAccessibilityFocusable())) {

[Ben Goodger (Google), 2012/04/13 15:26:29]

Can you just add this to views::Slider?

[sadrul, 2012/04/13 15:48:36]

Done (add Slider::set_focus_color so it can easily use the color defined in ash/
without depending on ash/).

+    canvas->DrawRect(gfx::Rect(1, 1, width() - 3, height() - 3),
+                     kFocusBorderColor);
+  }
+}
+
 views::View* CreateDetailedHeaderEntry(int string_id,
                                        ViewClickListener* listener) {
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   HoverHighlightView* container = new HoverHighlightView(listener);
   container->SetLayoutManager(new
       views::BoxLayout(views::BoxLayout::kHorizontal, 0, 3, kIconPaddingLeft));
   views::ImageView* back =
       new FixedSizedImageView(kTrayPopupDetailsIconWidth, 0);
   back->EnableCanvasFlippingForRTLUI(true);
   back->SetImage(rb.GetImageNamed(IDR_AURA_UBER_TRAY_LESS).ToSkBitmap());
@@ skipping 15 matching lines @@
   label->SetAutoColorReadabilityEnabled(false);
   label->SetEnabledColor(SK_ColorWHITE);
   label->SetBackgroundColor(SkColorSetARGB(0, 255, 255, 255));
   label->SetShadowColors(SkColorSetARGB(64, 0, 0, 0),
                          SkColorSetARGB(64, 0, 0, 0));
   label->SetShadowOffset(0, 1);
 }
 
 }  // namespace internal
 }  // namespace ash