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

Unified Diff: ui/message_center/views/message_center_view.cc

Issue 15019019: Merge 199426 "Fixes a crash bug of calling animator without check." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1500/src/
Patch Set: Created 7 years, 7 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/message_center/views/message_center_view.cc
===================================================================
--- ui/message_center/views/message_center_view.cc (revision 200013)
+++ ui/message_center/views/message_center_view.cc (working copy)
@@ -499,7 +499,8 @@
if (child->layer()) {
deleting_views_.insert(child);
} else {
- animator_->StopAnimatingView(child);
+ if (animator_.get())
+ animator_->StopAnimatingView(child);
delete child;
}
DoUpdateIfPossible();
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698