Use ink drop hover for focus states on toolbar buttons and location

ui/views/controls/button/label_button.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 "ui/views/controls/button/label_button.h"
 
 #include <stddef.h>
 
 #include <utility>
 
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "build/build_config.h"
+#include "ui/base/material_design/material_design_controller.h"
 #include "ui/gfx/animation/throb_animation.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/font_list.h"
 #include "ui/gfx/geometry/vector2d.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/views/animation/flood_fill_ink_drop_ripple.h"
 #include "ui/views/animation/ink_drop_hover.h"
 #include "ui/views/background.h"
 #include "ui/views/controls/button/label_button_border.h"
@@ skipping 75 matching lines @@
 
   AddChildView(image_);
   image_->set_interactive(false);
 
   AddChildView(label_);
   label_->SetFontList(cached_normal_font_list_);
   label_->SetAutoColorReadabilityEnabled(false);
   label_->SetHorizontalAlignment(gfx::ALIGN_TO_HEAD);
 
   // Inset the button focus rect from the actual border; roughly match Windows.
-  SetFocusPainter(Painter::CreateDashedFocusPainterWithInsets(gfx::Insets(
-      kFocusRectInset, kFocusRectInset, kFocusRectInset, kFocusRectInset)));
+  if (!ui::MaterialDesignController::IsModeMaterial()) {
+    SetFocusPainter(Painter::CreateDashedFocusPainterWithInsets(gfx::Insets(
+        kFocusRectInset, kFocusRectInset, kFocusRectInset, kFocusRectInset)));
+  }
 }
 
 LabelButton::~LabelButton() {}
 
 const gfx::ImageSkia& LabelButton::GetImage(ButtonState for_state) {
   if (for_state != STATE_NORMAL && button_state_images_[for_state].isNull())
     return button_state_images_[STATE_NORMAL];
   return button_state_images_[for_state];
 }
 
@@ skipping 446 matching lines @@
 void LabelButton::ResetLabelEnabledColor() {
   const SkColor color =
       explicitly_set_colors_[state()]
           ? button_state_colors_[state()]
           : PlatformStyle::TextColorForButton(button_state_colors_, *this);
   if (state() != STATE_DISABLED && label_->enabled_color() != color)
     label_->SetEnabledColor(color);
 }
 
 }  // namespace views