Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(9904)

Unified Diff: ash/system/toast/toast_overlay.cc

Issue 2041033002: Moved ButtonInkDropDelegate logic into InkDropHostView and deleted InkDropDelegates. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed merge conflict in custom_button.cc Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/ui/views/bar_control_button.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/toast/toast_overlay.cc
diff --git a/ash/system/toast/toast_overlay.cc b/ash/system/toast/toast_overlay.cc
index 3dcc52eb0b8c5ca36f5dfc0312d59f74139d648b..3004d076cdac0dd7f0ba369a5e421d31eb4067d4 100644
--- a/ash/system/toast/toast_overlay.cc
+++ b/ash/system/toast/toast_overlay.cc
@@ -19,7 +19,6 @@
#include "ui/base/resource/resource_bundle.h"
#include "ui/gfx/canvas.h"
#include "ui/gfx/font_list.h"
-#include "ui/views/animation/button_ink_drop_delegate.h"
#include "ui/views/border.h"
#include "ui/views/controls/button/label_button.h"
#include "ui/views/controls/label.h"
@@ -122,8 +121,7 @@ class ToastOverlayButton : public views::LabelButton {
ToastOverlayButton::ToastOverlayButton(views::ButtonListener* listener,
const base::string16& text)
: views::LabelButton(listener, text) {
- set_ink_drop_delegate(
- base::WrapUnique(new views::ButtonInkDropDelegate(this, this)));
+ SetHasInkDrop(true);
set_has_ink_drop_action_on_click(true);
set_ink_drop_base_color(SK_ColorWHITE);
« no previous file with comments | « no previous file | chrome/browser/ui/views/bar_control_button.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698