Full Keyboard Access: Second Approach

chrome/browser/ui/views/infobars/infobar_view.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 "chrome/browser/ui/views/infobars/infobar_view.h"
 
 #include <algorithm>
 #include <memory>
 #include <utility>
 
@@ skipping 22 matching lines @@
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/button/label_button_border.h"
 #include "ui/views/controls/button/md_text_button.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"
 #include "ui/views/controls/menu/menu_runner.h"
 #include "ui/views/layout/layout_constants.h"
+#include "ui/views/style/platform_style.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/non_client_view.h"
 
 
 // Helpers --------------------------------------------------------------------
 
 namespace {
 
 const int kEdgeItemPadding = views::kRelatedControlHorizontalSpacing;
 const int kIconToLabelSpacing = views::kRelatedControlHorizontalSpacing;
@@ skipping 100 matching lines @@
       false, views::Button::STATE_HOVERED,
       views::Painter::CreateImageGridPainter(kHoveredImageSet));
   const int kPressedImageSet[] = IMAGE_GRID(IDR_INFOBARBUTTON_PRESSED);
   button_border->SetPainter(
       false, views::Button::STATE_PRESSED,
       views::Painter::CreateImageGridPainter(kPressedImageSet));
   button->SetBorder(std::move(button_border));
   button->set_animate_on_state_change(false);
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   button->SetFontList(rb.GetFontList(ui::ResourceBundle::MediumFont));
-  button->SetFocusable(true);
+  views::PlatformStyle::ConfigureFocus(views::PlatformStyle::CONTROL::BUTTON,
+                                       button);
   button->SetTextColor(views::Button::STATE_NORMAL, GetInfobarTextColor());
   button->SetTextColor(views::Button::STATE_HOVERED, GetInfobarTextColor());
   return button;
 }
 
 views::MdTextButton* InfoBarView::CreateMdTextButton(
     views::ButtonListener* listener,
     const base::string16& text) {
   DCHECK(ui::MaterialDesignController::IsModeMaterial());
   views::MdTextButton* button =
@@ skipping 108 matching lines @@
       ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
       close_button_->SetImage(views::CustomButton::STATE_NORMAL,
                               rb.GetImageNamed(IDR_CLOSE_1).ToImageSkia());
       close_button_->SetImage(views::CustomButton::STATE_HOVERED,
                               rb.GetImageNamed(IDR_CLOSE_1_H).ToImageSkia());
       close_button_->SetImage(views::CustomButton::STATE_PRESSED,
                               rb.GetImageNamed(IDR_CLOSE_1_P).ToImageSkia());
     }
     close_button_->SetAccessibleName(
         l10n_util::GetStringUTF16(IDS_ACCNAME_CLOSE));
-    close_button_->SetFocusable(true);
+    views::PlatformStyle::ConfigureFocus(views::PlatformStyle::CONTROL::BUTTON,
+                                         close_button_);
     // Subclasses should already be done adding child views by this point (see
     // related DCHECK in Layout()).
     child_container_->AddChildView(close_button_);
   }
 
   // Ensure the infobar is tall enough to display its contents.
   int height = ui::MaterialDesignController::IsModeMaterial()
                    ? InfoBarContainerDelegate::kDefaultBarTargetHeightMd
                    : InfoBarContainerDelegate::kDefaultBarTargetHeight;
   const int kMinimumVerticalPadding = 6;
@@ skipping 133 matching lines @@
 }
 
 bool InfoBarView::DoesIntersectRect(const View* target,
                                     const gfx::Rect& rect) const {
   DCHECK_EQ(this, target);
   // Only events that intersect the portion below the arrow are interesting.
   gfx::Rect non_arrow_bounds = GetLocalBounds();
   non_arrow_bounds.Inset(0, arrow_height(), 0, 0);
   return rect.Intersects(non_arrow_bounds);
 }