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

Unified Diff: chrome/browser/ui/views/toolbar/back_button.cc

Issue 1280953003: Enhance the material design ripple API so the ripple's state can be controlled by it's owning View. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed some comments from patch set 1. Created 5 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
Index: chrome/browser/ui/views/toolbar/back_button.cc
diff --git a/chrome/browser/ui/views/toolbar/back_button.cc b/chrome/browser/ui/views/toolbar/back_button.cc
index 54c6f2f988420906f69c52044461e5474815a742..dcefcf79f8b038615f66ba41aba80342112b56b1 100644
--- a/chrome/browser/ui/views/toolbar/back_button.cc
+++ b/chrome/browser/ui/views/toolbar/back_button.cc
@@ -5,6 +5,7 @@
#include "chrome/browser/ui/views/toolbar/back_button.h"
#include "ui/gfx/geometry/insets.h"
+#include "ui/views/animation/ink_drop_animation_controller.h"
#include "ui/views/controls/button/label_button_border.h"
#include "ui/views/painter.h"
@@ -31,6 +32,11 @@ void BackButton::SetLeadingMargin(int margin) {
InvalidateLayout();
}
+void BackButton::LayoutInkDrop() {
+ ink_drop_animation_controller()->SetBounds(
tdanderson 2015/08/10 16:31:01 possible nit: perhaps SetBounds() on IDAC should b
bruthig 2015/08/10 21:57:15 Renaming done. I believe updating the ink drop bo
tdanderson 2015/08/11 12:57:36 Acknowledged.
+ gfx::Rect(margin_leading_, 0, width() - margin_leading_, height()));
+}
+
const char* BackButton::GetClassName() const {
return "BackButton";
}

Powered by Google App Engine
This is Rietveld 408576698