Index: ui/message_center/views/toast_contents_view.cc |
diff --git a/ui/message_center/views/toast_contents_view.cc b/ui/message_center/views/toast_contents_view.cc |
index d3e72e4184192b6bba9f4b91238ea21b264839c0..03ef309f511c46bb6e8289817b3596f7423b54c8 100644 |
--- a/ui/message_center/views/toast_contents_view.cc |
+++ b/ui/message_center/views/toast_contents_view.cc |
@@ -106,7 +106,7 @@ void ToastContentsView::ResetTimeout(int priority) { |
} |
void ToastContentsView::SuspendTimer() { |
- if (!timer_.get()) |
+ if (!timer_.get() || !timer_->IsRunning()) |
return; |
timer_->Stop(); |
passed_ += base::Time::Now() - start_time_; |
@@ -261,12 +261,12 @@ bool ToastContentsView::CanActivate() const { |
// views::View |
void ToastContentsView::OnMouseEntered(const ui::MouseEvent& event) { |
if (collection_) |
- collection_->OnMouseEntered(); |
+ collection_->OnMouseEntered(this); |
} |
void ToastContentsView::OnMouseExited(const ui::MouseEvent& event) { |
if (collection_) |
- collection_->OnMouseExited(); |
+ collection_->OnMouseExited(this); |
} |
void ToastContentsView::Layout() { |