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

Unified Diff: ash/common/system/web_notification/web_notification_tray.cc

Issue 2147143002: [Chrome OS MD] Draw a 1px separator between 2 tray items (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge conflicts + comments Created 4 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: ash/common/system/web_notification/web_notification_tray.cc
diff --git a/ash/common/system/web_notification/web_notification_tray.cc b/ash/common/system/web_notification/web_notification_tray.cc
index fd478d7e85cc96dd8841088add0f8886e3ed2b90..66e5ff0546c84ac13bec3e07e062af05e48bf7d3 100644
--- a/ash/common/system/web_notification/web_notification_tray.cc
+++ b/ash/common/system/web_notification/web_notification_tray.cc
@@ -177,9 +177,6 @@ class WebNotificationItem : public views::View, public gfx::AnimationDelegate {
protected:
// Overridden from views::View:
gfx::Size GetPreferredSize() const override {
- if (!animation_.get() || !animation_->is_animating())
yoshiki 2016/08/18 08:39:08 Please don't remove this. This is a short circuit
yiyix 2016/08/18 20:01:43 I am so sorry, i removed it as I tray different so
- return kTrayItemOuterSize;
-
// Animate the width (or height) when this item shows (or hides) so that
// the icons on the left are shifted with the animation.
// Note that TrayItemView does the same thing.
« ash/common/system/tray/tray_background_view.cc ('K') | « ash/common/system/tray/tray_constants.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698