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.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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 pkasting@'s comments from patch set 11 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

« no previous file with comments | « chrome/browser/ui/views/toolbar/back_button.h ('k') | chrome/browser/ui/views/toolbar/toolbar_button.h » ('j') | chrome/browser/ui/views/toolbar/toolbar_button.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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..73ae0411c64c06f374cbaab0be52536da6b57451 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()->SetInkDropBounds(

+ gfx::Rect(margin_leading_, 0, width() - margin_leading_, height()));

const char* BackButton::GetClassName() const {

return "BackButton";

}