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

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

Issue 1460733002: Updates to overrides of InkDropHost::AddInkDropLayer() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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/toolbar_button.cc
diff --git a/chrome/browser/ui/views/toolbar/toolbar_button.cc b/chrome/browser/ui/views/toolbar/toolbar_button.cc
index 33cfcd013c9dc9d0e64e3a372ebb59925614c3ab..f4c889b29169e6d713b423924e36a9e7e4745606 100644
--- a/chrome/browser/ui/views/toolbar/toolbar_button.cc
+++ b/chrome/browser/ui/views/toolbar/toolbar_button.cc
@@ -226,11 +226,16 @@ void ToolbarButton::ShowContextMenuForView(View* source,
void ToolbarButton::AddInkDropLayer(ui::Layer* ink_drop_layer) {
SetPaintToLayer(true);
+ SetFillsBoundsOpaquely(false);
image()->SetPaintToLayer(true);
image()->SetFillsBoundsOpaquely(false);
layer()->Add(ink_drop_layer);
layer()->StackAtBottom(ink_drop_layer);
+
+ // Invalidates the contents of the parent's layer which may contain
+ // a stale close/reload icon that should not remain visible.
+ parent()->SchedulePaint();
bruthig 2015/11/18 16:26:17 sadrul@, would it make sense to move this parent()
jonross 2015/11/18 16:36:52 I'm slightly surprised that changing the layer tre
bruthig 2015/11/18 16:51:19 I've posted my propsed changes here: https://coder
tdanderson 2015/11/19 15:15:42 Note I'm landing this CL as-is, feel free to modif
}
void ToolbarButton::RemoveInkDropLayer(ui::Layer* ink_drop_layer) {

Powered by Google App Engine
This is Rietveld 408576698