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

Unified Diff: ui/views/animation/ink_drop_host_view.cc

Issue 2833133003: views: disable ink drops altogether on Mac (Closed)
Patch Set: use InkDropStub Created 3 years, 8 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/checkbox.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/animation/ink_drop_host_view.cc
diff --git a/ui/views/animation/ink_drop_host_view.cc b/ui/views/animation/ink_drop_host_view.cc
index 5cdaedba6c9c7737aa1ffcf71cddc474326a5dcf..789f1b5e76eb05885906fafa8285d549cbc0dc59 100644
--- a/ui/views/animation/ink_drop_host_view.cc
+++ b/ui/views/animation/ink_drop_host_view.cc
@@ -15,6 +15,7 @@
#include "ui/views/animation/ink_drop_mask.h"
#include "ui/views/animation/ink_drop_stub.h"
#include "ui/views/animation/square_ink_drop_ripple.h"
+#include "ui/views/style/platform_style.h"
namespace views {
namespace {
@@ -271,7 +272,7 @@ std::unique_ptr<views::InkDropMask> InkDropHostView::CreateInkDropMask() const {
InkDrop* InkDropHostView::GetInkDrop() {
if (!ink_drop_) {
- if (ink_drop_mode_ == InkDropMode::OFF)
+ if (ink_drop_mode_ == InkDropMode::OFF || !PlatformStyle::kUseRipples)
ink_drop_ = base::MakeUnique<InkDropStub>();
else
ink_drop_ = CreateInkDrop();
« no previous file with comments | « no previous file | ui/views/controls/button/checkbox.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698