Full Keyboard Access: Second Approach

chrome/browser/ui/views/toolbar/toolbar_action_view.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 "chrome/browser/ui/views/toolbar/toolbar_action_view.h"
 
 #include <string>
 
 #include "base/auto_reset.h"
 #include "base/bind.h"
@@ skipping 15 matching lines @@
 #include "ui/gfx/image/image_skia_operations.h"
 #include "ui/gfx/image/image_skia_source.h"
 #include "ui/resources/grit/ui_resources.h"
 #include "ui/views/animation/button_ink_drop_delegate.h"
 #include "ui/views/controls/button/label_button_border.h"
 #include "ui/views/controls/menu/menu_controller.h"
 #include "ui/views/controls/menu/menu_model_adapter.h"
 #include "ui/views/controls/menu/menu_runner.h"
 #include "ui/views/mouse_constants.h"
 #include "ui/views/resources/grit/views_resources.h"
+#include "ui/views/style/platform_style.h"
 
 using views::LabelButtonBorder;
 
 namespace {
 
 // Toolbar action buttons have no insets because the badges are drawn right at
 // the edge of the view's area. Other badding (such as centering the icon) is
 // handled directly by the Image.
 const int kBorderInset = 0;
 
@@ skipping 24 matching lines @@
   SetHorizontalAlignment(gfx::ALIGN_CENTER);
   set_drag_controller(delegate_);
 
   set_context_menu_controller(this);
 
   // If the button is within a menu, we need to make it focusable in order to
   // have it accessible via keyboard navigation, but it shouldn't request focus
   // (because that would close the menu).
   if (delegate_->ShownInsideMenu()) {
     set_request_focus_on_press(false);
-    SetFocusable(true);
+    views::PlatformStyle::ConfigureFocus(
+        views::PlatformStyle::CONTROL::IN_MENU_BUTTON, this);
   }
 
   UpdateState();
 }
 
 ToolbarActionView::~ToolbarActionView() {
   // Avoid access to a destroyed InkDropDelegate when the |pressed_lock_| is
   // destroyed.
   set_ink_drop_delegate(nullptr);
   view_controller_->SetDelegate(nullptr);
@@ skipping 235 matching lines @@
     if (menu_controller->in_nested_run()) {
       // There is another menu showing. Close the outermost menu (since we are
       // shown in the same menu, we don't want to close the whole thing).
       menu_controller->Cancel(views::MenuController::EXIT_OUTERMOST);
       return true;
     }
   }
 
   return false;
 }