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

chrome/browser/ui/views/message_center/web_notification_tray.cc

 // Copyright 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 "chrome/browser/ui/views/message_center/web_notification_tray.h"
 
 #include "base/i18n/number_formatting.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/status_icons/status_icon.h"
 #include "chrome/browser/status_icons/status_icon_menu_model.h"
 #include "chrome/browser/status_icons/status_tray.h"
 #include "content/public/browser/notification_service.h"
-#include "content/public/browser/user_metrics.h"
 #include "grit/chromium_strings.h"
 #include "grit/theme_resources.h"
 #include "grit/ui_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image_skia_operations.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/screen.h"
 #include "ui/gfx/size.h"
@@ skipping 30 matching lines @@
       resource_id = IDR_NOTIFICATION_TRAY_ATTENTION;
   } else if (is_quiet_mode) {
     resource_id = IDR_NOTIFICATION_TRAY_DO_NOT_DISTURB_EMPTY;
   }
 
   return rb.GetImageSkiaNamed(resource_id);
 }
 
 }  // namespace
 
-using content::UserMetricsAction;
-
 namespace message_center {
 
 namespace internal {
 
 // Gets the position of the taskbar from the work area bounds. Returns
 // ALIGNMENT_NONE if position cannot be found.
 Alignment GetTaskbarAlignment() {
   gfx::Screen* screen = gfx::Screen::GetNativeScreen();
   // TODO(dewittj): It's possible GetPrimaryDisplay is wrong.
   gfx::Rect screen_bounds = screen->GetPrimaryDisplay().bounds();
@@ skipping 76 matching lines @@
 }
 
 bool WebNotificationTray::ShowPopups() {
   popup_collection_.reset(new message_center::MessagePopupCollection(
       NULL, message_center(), message_center_tray_.get(), false));
   return true;
 }
 
 void WebNotificationTray::HidePopups() { popup_collection_.reset(); }
 
-bool WebNotificationTray::ShowMessageCenterInternal(bool show_settings) {
-  content::RecordAction(UserMetricsAction("Notifications.ShowMessageCenter"));
-
-  // Message center delegate will be set to NULL when the message center
-  // widget's Close method is called so we don't need to worry about
-  // use-after-free issues.
-  message_center_delegate_ = new MessageCenterWidgetDelegate(
-      this,
-      message_center_tray_.get(),
-      show_settings,  // settings initally invisible
-      GetPositionInfo());
+bool WebNotificationTray::ShowMessageCenter() {
+  message_center_delegate_ =
+      new MessageCenterWidgetDelegate(this,
+                                      message_center_tray_.get(),
+                                      false,  // settings initally invisible
+                                      GetPositionInfo());
 
   return true;
 }
 
-bool WebNotificationTray::ShowMessageCenter() {
-  return ShowMessageCenterInternal(/*show_settings =*/false);
-}
-
 void WebNotificationTray::HideMessageCenter() {
   if (message_center_delegate_) {
     views::Widget* widget = message_center_delegate_->GetWidget();
     if (widget)
       widget->Close();
   }
 }
 
 bool WebNotificationTray::ShowNotifierSettings() {
   if (message_center_delegate_) {
     message_center_delegate_->SetSettingsVisible(true);
     return true;
   }
-  return ShowMessageCenterInternal(/*show_settings =*/true);
+  message_center_delegate_ =
+      new MessageCenterWidgetDelegate(this,
+                                      message_center_tray_.get(),
+                                      true,  // settings initally visible
+                                      GetPositionInfo());
+
+  return true;
 }
 
 void WebNotificationTray::OnMessageCenterTrayChanged() {
   if (status_icon_) {
     bool quiet_mode_state = message_center()->IsQuietMode();
     if (last_quiet_mode_state_ != quiet_mode_state) {
       last_quiet_mode_state_ = quiet_mode_state;
 
       // Quiet mode has changed, update the quiet mode menu.
       status_icon_menu_->SetCommandIdChecked(kToggleQuietMode,
@@ skipping 162 matching lines @@
   status_icon_menu_ = menu.get();
   status_icon->SetContextMenu(menu.Pass());
 }
 
 MessageCenterWidgetDelegate*
 WebNotificationTray::GetMessageCenterWidgetDelegateForTest() {
   return message_center_delegate_;
 }
 
 }  // namespace message_center