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

Unified Diff: ui/views/controls/button/checkbox.cc

Issue 2948753003: Revert of Fix Harmony checkbox having an ink drop highlight on click. (Closed)
Patch Set: Created 3 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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/button/checkbox.cc
diff --git a/ui/views/controls/button/checkbox.cc b/ui/views/controls/button/checkbox.cc
index ddf64ece50e4a8ac1c2b5b5ff5ff82ce04bc6d9c..1438fc4745f8cd0bad24b1cf37c52a6c5a96e22c 100644
--- a/ui/views/controls/button/checkbox.cc
+++ b/ui/views/controls/button/checkbox.cc
@@ -14,7 +14,7 @@
#include "ui/gfx/canvas.h"
#include "ui/gfx/color_utils.h"
#include "ui/gfx/paint_vector_icon.h"
-#include "ui/views/animation/ink_drop_impl.h"
+#include "ui/views/animation/ink_drop_highlight.h"
#include "ui/views/animation/ink_drop_ripple.h"
#include "ui/views/animation/square_ink_drop_ripple.h"
#include "ui/views/controls/button/label_button_border.h"
@@ -143,10 +143,8 @@
}
std::unique_ptr<InkDrop> Checkbox::CreateInkDrop() {
- // Completely removes the highlight.
- std::unique_ptr<InkDropImpl> ink_drop = CreateDefaultInkDropImpl();
+ std::unique_ptr<InkDrop> ink_drop = LabelButton::CreateInkDrop();
ink_drop->SetShowHighlightOnHover(false);
- ink_drop->SetAutoHighlightMode(views::InkDropImpl::AutoHighlightMode::NONE);
return ink_drop;
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698