Use ink drop highlight for focus on arc intent picker buttons.

chrome/browser/ui/views/intent_picker_bubble_view.cc

 // Copyright 2016 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/intent_picker_bubble_view.h"
 
 #include "base/bind.h"
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/toolbar/toolbar_view.h"
 #include "chrome/grit/generated_resources.h"
 #include "content/public/browser/navigation_handle.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/canvas.h"
 #include "ui/views/animation/ink_drop_host_view.h"
+#include "ui/views/animation/ink_drop_impl.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/scroll_view.h"
 #include "ui/views/controls/scrollbar/overlay_scroll_bar.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/layout/grid_layout.h"
+#include "ui/views/painter.h"
 #include "ui/views/window/dialog_client_view.h"
 
 namespace {
 
 // Using |kMaxAppResults| as a measure of how many apps we want to show.
 constexpr size_t kMaxAppResults = arc::ArcNavigationThrottle::kMaxAppResults;
 // Main components sizes
 constexpr int kTitlePadding = 16;
 constexpr int kDialogDelegateInsets = 16;
 constexpr int kRowHeight = 40;
@@ skipping 19 matching lines @@
   IntentPickerLabelButton(views::ButtonListener* listener,
                           gfx::Image* icon,
                           const std::string& package_name,
                           const std::string& activity_name)
       : LabelButton(listener,
                     base::UTF8ToUTF16(base::StringPiece(activity_name))),
         package_name_(package_name) {
     SetHorizontalAlignment(gfx::ALIGN_LEFT);
     SetMinSize(gfx::Size(kMaxWidth, kRowHeight));
     SetInkDropMode(InkDropMode::ON);
+    SetFocusPainter(nullptr);
     if (!icon->IsEmpty())
       SetImage(views::ImageButton::STATE_NORMAL, *icon->ToImageSkia());
     SetBorder(views::CreateEmptyBorder(10, 16, 10, 0));
   }
 
   SkColor GetInkDropBaseColor() const override { return SK_ColorBLACK; }
 
   void MarkAsUnselected(const ui::Event* event) {
     AnimateInkDrop(views::InkDropState::HIDDEN,
                    ui::LocatedEvent::FromIfValid(event));
   }
 
   void MarkAsSelected(const ui::Event* event) {
     AnimateInkDrop(views::InkDropState::ACTIVATED,
                    ui::LocatedEvent::FromIfValid(event));
   }
 
   views::InkDropState GetTargetInkDropState() {
     return GetInkDrop()->GetTargetInkDropState();
   }
 
+  // LabelButton:
+  std::unique_ptr<views::InkDrop> CreateInkDrop() override {
+    std::unique_ptr<views::InkDropImpl> ink_drop =
+        CreateDefaultFloodFillInkDropImpl();
+    ink_drop->SetShowHighlightOnFocus(true);
+    return std::move(ink_drop);
+  }
+
  private:
   std::string package_name_;
 
   DISALLOW_COPY_AND_ASSIGN(IntentPickerLabelButton);
 };
 
 // static
 void IntentPickerBubbleView::ShowBubble(
     content::WebContents* web_contents,
     const std::vector<AppInfo>& app_info,
@@ skipping 241 matching lines @@
     size_t index) {
   return GetIntentPickerLabelButtonAt(index)->GetTargetInkDropState();
 }
 
 void IntentPickerBubbleView::PressButtonForTesting(size_t index,
                                                    const ui::Event& event) {
   views::Button* button =
       static_cast<views::Button*>(GetIntentPickerLabelButtonAt(index));
   ButtonPressed(button, event);
 }