| Index: chrome/browser/ui/views/toolbar/toolbar_action_view.cc
|
| diff --git a/chrome/browser/ui/views/toolbar/toolbar_action_view.cc b/chrome/browser/ui/views/toolbar/toolbar_action_view.cc
|
| index bff4184949065fa8a359a1f82b59ce0333eff2ba..40e9ee8617d4115976b399b3379419e9243fae82 100644
|
| --- a/chrome/browser/ui/views/toolbar/toolbar_action_view.cc
|
| +++ b/chrome/browser/ui/views/toolbar/toolbar_action_view.cc
|
| @@ -10,6 +10,7 @@
|
| #include "base/bind.h"
|
| #include "chrome/browser/chrome_notification_types.h"
|
| #include "chrome/browser/sessions/session_tab_helper.h"
|
| +#include "chrome/browser/themes/theme_properties.h"
|
| #include "chrome/browser/ui/toolbar/toolbar_action_view_controller.h"
|
| #include "chrome/browser/ui/toolbar/toolbar_actions_bar.h"
|
| #include "chrome/browser/ui/view_ids.h"
|
| @@ -18,6 +19,7 @@
|
| #include "grit/theme_resources.h"
|
| #include "ui/accessibility/ax_view_state.h"
|
| #include "ui/base/resource/resource_bundle.h"
|
| +#include "ui/base/theme_provider.h"
|
| #include "ui/compositor/paint_recorder.h"
|
| #include "ui/events/event.h"
|
| #include "ui/gfx/image/image_skia.h"
|
| @@ -116,10 +118,14 @@ void ToolbarActionView::AddInkDropLayer(ui::Layer* ink_drop_layer) {
|
|
|
| void ToolbarActionView::RemoveInkDropLayer(ui::Layer* ink_drop_layer) {
|
| views::MenuButton::RemoveInkDropLayer(ink_drop_layer);
|
| - image()->SetFillsBoundsOpaquely(true);
|
| image()->SetPaintToLayer(false);
|
| }
|
|
|
| +SkColor ToolbarActionView::GetInkDropBaseColor() const {
|
| + return GetThemeProvider()->GetColor(
|
| + ThemeProperties::COLOR_TOOLBAR_BUTTON_ICON);
|
| +}
|
| +
|
| content::WebContents* ToolbarActionView::GetCurrentWebContents() const {
|
| return delegate_->GetCurrentWebContents();
|
| }
|
|
|