Fixing focus highlight on high DPI devices for accessibility

ui/message_center/views/notifier_settings_view.cc

 // Copyright (c) 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/notifier_settings_view.h"
 
 #include <set>
 #include <string>
 
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "grit/ui_resources.h"
 #include "grit/ui_strings.h"
 #include "skia/ext/image_operations.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/simple_menu_model.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/size.h"
 #include "ui/message_center/message_center_style.h"
-#include "ui/message_center/views/message_center_focus_border.h"
 #include "ui/message_center/views/message_center_view.h"
 #include "ui/views/background.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/button/checkbox.h"
 #include "ui/views/controls/button/custom_button.h"
 #include "ui/views/controls/button/label_button_border.h"
 #include "ui/views/controls/button/menu_button.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/link.h"
@@ skipping 82 matching lines @@
 // The blank space above the title needs to be adjusted by the amount of blank
 // space included in the title label.
 const int kComputedTitleTopMargin =
     settings::kTopMargin - kInnateTitleTopMargin;
 
 // The switcher has a lot of blank space built in so we should include that when
 // spacing the title area vertically.
 const int kComputedTitleElementSpacing =
     settings::kDescriptionToSwitcherSpace - kButtonPainterInsets - 1;
 
+// A function to create a focus border.
+views::FocusBorder* CreateFocusBorder() {
+  return views::FocusBorder::CreateSolidFocusBorder(kFocusBorderColor,
+                                                    gfx::Insets(1, 2, 3, 2));
+}
 
 // EntryView ------------------------------------------------------------------
 
 // The view to guarantee the 48px height and place the contents at the
 // middle. It also guarantee the left margin.
 class EntryView : public views::View {
  public:
   EntryView(views::View* contents);
   virtual ~EntryView();
 
   // views::View:
   virtual void Layout() OVERRIDE;
   virtual gfx::Size GetPreferredSize() OVERRIDE;
   virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
   virtual void OnFocus() OVERRIDE;
   virtual bool OnKeyPressed(const ui::KeyEvent& event) OVERRIDE;
   virtual bool OnKeyReleased(const ui::KeyEvent& event) OVERRIDE;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(EntryView);
 };
 
 EntryView::EntryView(views::View* contents) {
-  set_focus_border(new MessageCenterFocusBorder());
+  set_focus_border(CreateFocusBorder());
   AddChildView(contents);
 }
 
 EntryView::~EntryView() {}
 
 void EntryView::Layout() {
   DCHECK_EQ(1, child_count());
   views::View* content = child_at(0);
   int content_width = width();
   int content_height = content->GetHeightForWidth(content_width);
@@ skipping 122 matching lines @@
   icon_view_->set_owned_by_client();
 
   checkbox_->SetChecked(notifier_->enabled);
   checkbox_->set_listener(this);
   checkbox_->set_focusable(false);
   checkbox_->SetAccessibleName(notifier_->name);
 
   if (ShouldHaveLearnMoreButton()) {
     // Create a more-info button that will be right-aligned.
     learn_more_ = new views::ImageButton(this);
-    learn_more_->set_focus_border(new MessageCenterFocusBorder());
+    learn_more_->set_focus_border(CreateFocusBorder());
     learn_more_->set_request_focus_on_press(false);
     learn_more_->set_focusable(true);
 
     ui::ResourceBundle& rb = ResourceBundle::GetSharedInstance();
     learn_more_->SetImage(
         views::Button::STATE_NORMAL,
         rb.GetImageSkiaNamed(IDR_NOTIFICATION_ADVANCED_SETTINGS));
     learn_more_->SetImage(
         views::Button::STATE_HOVERED,
         rb.GetImageSkiaNamed(IDR_NOTIFICATION_ADVANCED_SETTINGS_HOVER));
@@ skipping 394 matching lines @@
                                              menu_anchor,
                                              views::MenuItemView::BUBBLE_ABOVE,
                                              ui::MENU_SOURCE_MOUSE,
                                              views::MenuRunner::CONTEXT_MENU))
     return;
   MessageCenterView* center_view = static_cast<MessageCenterView*>(parent());
   center_view->OnSettingsChanged();
 }
 
 }  // namespace message_center