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

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

Issue 2270933002: Harmony: disable ripples on Mac (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: call superclass in StateChanged Created 4 years, 4 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 | ui/views/controls/button/md_text_button.h » ('j') | 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 b8431f4ee27b59078dd26807136cd25a4aed6080..ae7636732422a76c26ad92d457c9d93f15cb96fc 100644
--- a/ui/views/controls/button/checkbox.cc
+++ b/ui/views/controls/button/checkbox.cc
@@ -21,6 +21,7 @@
#include "ui/views/controls/button/label_button_border.h"
#include "ui/views/painter.h"
#include "ui/views/resources/grit/views_resources.h"
+#include "ui/views/style/platform_style.h"
namespace views {
@@ -35,7 +36,8 @@ Checkbox::Checkbox(const base::string16& label)
if (UseMd()) {
set_request_focus_on_press(false);
- SetInkDropMode(InkDropMode::ON);
+ SetInkDropMode(PlatformStyle::kUseRipples ? InkDropMode::ON
+ : InkDropMode::OFF);
set_has_ink_drop_action_on_click(true);
// The "small" size is 21dp, the large size is 1.33 * 21dp = 28dp.
set_ink_drop_size(gfx::Size(21, 21));
« no previous file with comments | « no previous file | ui/views/controls/button/md_text_button.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698