[MD] Use same focus ring on BarControlButton as MdTextButton.

chrome/browser/ui/views/bar_control_button.cc

 // Copyright 2015 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/bar_control_button.h"
 
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/gfx/vector_icons_public.h"
 #include "ui/views/animation/button_ink_drop_delegate.h"
 #include "ui/views/border.h"
+#include "ui/views/painter.h"
 
 namespace {
 
 // Extra space around the buttons to increase their event target size.
 const int kButtonExtraTouchSize = 4;
 
 }  // namespace
 
 BarControlButton::BarControlButton(views::ButtonListener* listener)
     : views::ImageButton(listener),
       id_(gfx::VectorIconId::VECTOR_ICON_NONE),
       ink_drop_delegate_(new views::ButtonInkDropDelegate(this, this)) {
   set_ink_drop_delegate(ink_drop_delegate_.get());
   set_has_ink_drop_action_on_click(true);
   SetImageAlignment(views::ImageButton::ALIGN_CENTER,
                     views::ImageButton::ALIGN_MIDDLE);
+  SetFocusPainter(nullptr);
+  UseMdFocusRing();
 }
 
 BarControlButton::~BarControlButton() {}
 
 void BarControlButton::SetIcon(
     gfx::VectorIconId id,
     const base::Callback<SkColor(void)>& get_text_color_callback) {
   id_ = id;
   get_text_color_callback_ = get_text_color_callback;
 
   if (!border()) {
     SetBorder(views::Border::CreateEmptyBorder(
         kButtonExtraTouchSize, kButtonExtraTouchSize, kButtonExtraTouchSize,
         kButtonExtraTouchSize));
   }
 }
 
 void BarControlButton::OnThemeChanged() {
   SkColor icon_color =
       color_utils::DeriveDefaultIconColor(get_text_color_callback_.Run());
   gfx::ImageSkia image = gfx::CreateVectorIcon(id_, 16, icon_color);
   SetImage(views::CustomButton::STATE_NORMAL, &image);
   image = gfx::CreateVectorIcon(id_, 16, SkColorSetA(icon_color, 0xff / 2));
   SetImage(views::CustomButton::STATE_DISABLED, &image);
   set_ink_drop_base_color(icon_color);
+  SizeToPreferredSize();

[sky, 2016/03/22 15:31:40]

What view has BarControlButton in it? I get nervous with random
SizeToPreferredSize as that is generally better down in the parent doing the
layout.

[Evan Stade, 2016/03/22 17:35:44]

infobarview, find bar, download shelf. The alternative is to reimplement
GetPreferredSize so it returns the right thing even before OnThemeChanged, but
that seemed like slightly duplicate logic to me and I couldn't think of a way
sizing this here would cause harm. The button is not likely to do the right
thing/look right if you don't size it to its preferred size so in some sense
it's an error if a parent doesn't do this.

[sky, 2016/03/22 18:02:27]

Doesn't find bar and the like need to relayout in this case? What triggers that?

[Evan Stade, 2016/03/22 18:16:11]

This code path gets hit as soon as BarControlButton is added to the child
hierarchy (AddChildView -> OnNativeThemeChanged -> OnThemeChanged). The parent
will necessarily call Layout() after this.

Granted, this won't work if subsequent theme changes were to change the size of
the button, which they currently don't. Another way to write this would be:

if (parent() && size() != GetPreferredSize())
  parent()->Layout();

but then the parent has to call SizeToPreferredSize (in the sense that it's
probably an error to size it to anything else).

 }
 
 void BarControlButton::OnNativeThemeChanged(const ui::NativeTheme* theme) {
   OnThemeChanged();
 }