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

Unified Diff: ash/common/system/tray/tray_background_view.cc

Issue 2510633004: Revert of Take size in ink drop masks instead of bounds (Closed)
Patch Set: Created 4 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
« no previous file with comments | « ash/common/shelf/app_list_button.cc ('k') | ui/views/animation/ink_drop_mask.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/system/tray/tray_background_view.cc
diff --git a/ash/common/system/tray/tray_background_view.cc b/ash/common/system/tray/tray_background_view.cc
index 0a0b41ec9839557e1df511169291a552860e33a4..f199953225b22017174a650ac12e8f637de01842 100644
--- a/ash/common/system/tray/tray_background_view.cc
+++ b/ash/common/system/tray/tray_background_view.cc
@@ -526,7 +526,8 @@
std::unique_ptr<views::InkDropMask> TrayBackgroundView::CreateInkDropMask()
const {
return base::MakeUnique<views::RoundRectInkDropMask>(
- size(), GetBackgroundBounds(GetContentsBounds(), shelf_alignment_),
+ GetLocalBounds(),
+ GetBackgroundBounds(GetContentsBounds(), shelf_alignment_),
kTrayRoundedBorderRadius);
}
« no previous file with comments | « ash/common/shelf/app_list_button.cc ('k') | ui/views/animation/ink_drop_mask.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698