Notifications: Add cross-platform UMA: ShowMessageCenter, ShowSettings.

chrome/browser/notifications/message_center_notifications_browsertest.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/notifications/message_center_notification_manager.h"
 #include "chrome/browser/notifications/notification.h"
 #include "chrome/browser/notifications/notification_ui_manager.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/test_switches.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_source.h"
 #include "ui/message_center/message_center.h"
 #include "ui/message_center/message_center_switches.h"
+#include "ui/message_center/message_center_types.h"
 #include "ui/message_center/message_center_util.h"
 
 class TestAddObserver : public message_center::MessageCenterObserver {
  public:
   explicit TestAddObserver(message_center::MessageCenter* message_center)
       : message_center_(message_center) {
     message_center_->AddObserver(this);
   }
 
   virtual ~TestAddObserver() { message_center_->RemoveObserver(this); }
@@ skipping 240 matching lines @@
     return;
 #endif
 
   EXPECT_TRUE(NotificationUIManager::DelegatesToMessageCenter());
   TestAddObserver observer(message_center());
 
   TestDelegate* delegate;
   TestDelegate* delegate2;
 
   manager()->Add(CreateTestNotification("n", &delegate), profile());
-  message_center()->SetMessageCenterVisible(true);
+  message_center()->SetVisibility(message_center::VISIBILITY_MESSAGE_CENTER);
   manager()->Add(CreateTestNotification("n2", &delegate2), profile());
 
   EXPECT_EQ("add-n", observer.log());
 
-  message_center()->SetMessageCenterVisible(false);
+  message_center()->SetVisibility(message_center::VISIBILITY_TRANSIENT);
 
   EXPECT_EQ("add-n_add-n2", observer.log());
 
   delegate->Release();
   delegate2->Release();
 }
 
 // MessaceCenter-specific test.
 #if defined(RUN_MESSAGE_CENTER_TESTS)
 #define MAYBE_UpdateNonProgressNotificationWhenCenterVisible \
@@ skipping 14 matching lines @@
   EXPECT_TRUE(NotificationUIManager::DelegatesToMessageCenter());
   TestAddObserver observer(message_center());
 
   TestDelegate* delegate;
 
   // Add a non-progress notification and update it while the message center
   // is visible.
   Notification notification = CreateTestNotification("n", &delegate);
   manager()->Add(notification, profile());
   message_center()->ClickOnNotification("n");
-  message_center()->SetMessageCenterVisible(true);
+  message_center()->SetVisibility(message_center::VISIBILITY_MESSAGE_CENTER);
   observer.reset_log();
   notification.set_title(ASCIIToUTF16("title2"));
   manager()->Update(notification, profile());
 
   // Expect that the notification update is not done.
   EXPECT_EQ("", observer.log());
 
   delegate->Release();
 }
 
@@ skipping 18 matching lines @@
   EXPECT_TRUE(NotificationUIManager::DelegatesToMessageCenter());
   TestAddObserver observer(message_center());
 
   TestDelegate* delegate;
 
   // Add a non-progress notification and change the type to progress while the
   // message center is visible.
   Notification notification = CreateTestNotification("n", &delegate);
   manager()->Add(notification, profile());
   message_center()->ClickOnNotification("n");
-  message_center()->SetMessageCenterVisible(true);
+  message_center()->SetVisibility(message_center::VISIBILITY_MESSAGE_CENTER);
   observer.reset_log();
   notification.set_type(message_center::NOTIFICATION_TYPE_PROGRESS);
   manager()->Update(notification, profile());
 
   // Expect that the notification update is not done.
   EXPECT_EQ("", observer.log());
 
   delegate->Release();
 }
 
@@ skipping 18 matching lines @@
   TestAddObserver observer(message_center());
 
   TestDelegate* delegate;
 
   // Add a progress notification and update it while the message center
   // is visible.
   Notification notification = CreateTestNotification("n", &delegate);
   notification.set_type(message_center::NOTIFICATION_TYPE_PROGRESS);
   manager()->Add(notification, profile());
   message_center()->ClickOnNotification("n");
-  message_center()->SetMessageCenterVisible(true);
+  message_center()->SetVisibility(message_center::VISIBILITY_MESSAGE_CENTER);
   observer.reset_log();
   notification.set_progress(50);
   manager()->Update(notification, profile());
 
   // Expect that the progress notification update is performed.
   EXPECT_EQ("update-n", observer.log());
 
   delegate->Release();
 }
 
@@ skipping 16 matching lines @@
   // Cast so that Observe() is public.
   content::NotificationObserver* observer =
       static_cast<content::NotificationObserver*>(manager());
   observer->Observe(chrome::NOTIFICATION_FULLSCREEN_CHANGED,
                     content::Source<Profile>(profile()),
                     content::Details<bool>(&is_fullscreen));
   EXPECT_FALSE(message_center()->HasPopupNotifications());
 }
 
 #endif  // !defined(OS_MACOSX)