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

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

Issue 23636010: Notifications: Add cross-platform UMA: ShowMessageCenter, ShowSettings. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Added the hash to chromeactions.txt Created 7 years, 3 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 | « ui/message_center/message_center_types.h ('k') | ui/message_center/views/message_view.cc » ('j') | 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
diff --git a/ui/message_center/views/message_center_view.cc b/ui/message_center/views/message_center_view.cc
index 95c2cc376699f7e0f71bdf92eebc83259e1cb578..4d687548bef1819b33cad8ae09fe278b65a47342 100644
--- a/ui/message_center/views/message_center_view.cc
+++ b/ui/message_center/views/message_center_view.cc
@@ -20,6 +20,7 @@
#include "ui/gfx/size.h"
#include "ui/message_center/message_center.h"
#include "ui/message_center/message_center_style.h"
+#include "ui/message_center/message_center_types.h"
#include "ui/message_center/views/message_center_button_bar.h"
#include "ui/message_center/views/message_view.h"
#include "ui/message_center/views/notification_view.h"
@@ -934,6 +935,11 @@ void MessageCenterView::OnNotificationUpdated(const std::string& id) {
void MessageCenterView::AnimationEnded(const ui::Animation* animation) {
DCHECK_EQ(animation, settings_transition_animation_.get());
+ Visibility visibility = target_view_ == settings_view_
+ ? VISIBILITY_SETTINGS
+ : VISIBILITY_MESSAGE_CENTER;
+ message_center_->SetVisibility(visibility);
+
source_view_->SetVisible(false);
target_view_->SetVisible(true);
if (source_view_->layer())
« no previous file with comments | « ui/message_center/message_center_types.h ('k') | ui/message_center/views/message_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698