Fixing focus highlight on high DPI devices for accessibility

ui/message_center/views/message_center_button_bar.cc

 // Copyright 2013 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 "ui/message_center/views/message_center_button_bar.h"
 
 #include "grit/ui_resources.h"
 #include "grit/ui_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/simple_menu_model.h"
@@ skipping 32 matching lines @@
   NotificationCenterButton(views::ButtonListener* listener,
                            int normal_id,
                            int hover_id,
                            int pressed_id,
                            int text_id);
   void set_size(gfx::Size size) { size_ = size; }
 
  protected:
   // Overridden from views::View:
   virtual gfx::Size GetPreferredSize() OVERRIDE;
-  virtual void OnPaintFocusBorder(gfx::Canvas* canvas) OVERRIDE;
 
  private:
   gfx::Size size_;
 
   DISALLOW_COPY_AND_ASSIGN(NotificationCenterButton);
 };
 
 NotificationCenterButton::NotificationCenterButton(
     views::ButtonListener* listener,
     int normal_id,
     int hover_id,
     int pressed_id,
     int text_id)
     : views::ToggleImageButton(listener), size_(kButtonSize, kButtonSize) {
   ui::ResourceBundle& resource_bundle = ui::ResourceBundle::GetSharedInstance();
   SetImage(STATE_NORMAL, resource_bundle.GetImageSkiaNamed(normal_id));
   SetImage(STATE_HOVERED, resource_bundle.GetImageSkiaNamed(hover_id));
   SetImage(STATE_PRESSED, resource_bundle.GetImageSkiaNamed(pressed_id));
   SetImageAlignment(views::ImageButton::ALIGN_CENTER,
                     views::ImageButton::ALIGN_MIDDLE);
   if (text_id)
     SetTooltipText(resource_bundle.GetLocalizedString(text_id));
 
   set_focusable(true);
   set_request_focus_on_press(false);
+
+  set_focus_border(views::FocusBorder::CreateSolidFocusBorder(
+      kFocusBorderColor,
+      gfx::Insets(1, 2, 2, 2)));
 }
 
 gfx::Size NotificationCenterButton::GetPreferredSize() { return size_; }
 
-void NotificationCenterButton::OnPaintFocusBorder(gfx::Canvas* canvas) {
-  if (HasFocus()) {
-    canvas->DrawRect(gfx::Rect(2, 1, width() - 4, height() - 3),
-                     kFocusBorderColor);
-  }
-}
-
 // MessageCenterButtonBar /////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
 MessageCenterButtonBar::MessageCenterButtonBar(
     MessageCenterView* message_center_view,
     MessageCenter* message_center,
     NotifierSettingsProvider* notifier_settings_provider,
     bool settings_initially_visible)
     : message_center_view_(message_center_view),
       message_center_(message_center),
       title_arrow_(NULL),
@@ skipping 165 matching lines @@
       message_center()->SetQuietMode(false);
     else
       message_center()->EnterQuietModeWithExpire(base::TimeDelta::FromDays(1));
     quiet_mode_button_->SetToggled(message_center()->IsQuietMode());
   } else {
     NOTREACHED();
   }
 }
 
 }  // namespace message_center