Added UMA Metrics for SMS UI in the status area.

ash/common/system/chromeos/network/tray_sms.cc

 // Copyright (c) 2012 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 "ash/common/system/chromeos/network/tray_sms.h"
 
 #include "ash/common/material_design/material_design_controller.h"
+#include "ash/common/metrics/user_metrics_action.h"
 #include "ash/common/system/tray/fixed_sized_scroll_view.h"
 #include "ash/common/system/tray/system_tray_bubble.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/system/tray/tray_details_view.h"
 #include "ash/common/system/tray/tray_item_more.h"
 #include "ash/common/system/tray/tray_item_view.h"
 #include "ash/common/system/tray/tray_notification_view.h"
 #include "ash/common/system/tray/view_click_listener.h"
+#include "ash/common/wm_shell.h"
 #include "ash/system/tray/system_tray.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chromeos/network/network_event_log.h"
 #include "chromeos/network/network_handler.h"
 #include "grit/ash_resources.h"
 #include "grit/ash_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/paint_vector_icon.h"
@@ skipping 90 matching lines @@
     if (view_type == VIEW_DETAILED)
       LayoutDetailedView();
     else
       LayoutNotificationView();
   }
 
   ~SmsMessageView() override {}
 
   // Overridden from ButtonListener.
   void ButtonPressed(views::Button* sender, const ui::Event& event) override {
-    owner_->RemoveMessage(index_);
+    if (owner_->RemoveMessage(index_)) {
+      WmShell::Get()->RecordUserMetricsAction(
+          UMA_STATUS_AREA_SMS_DETAILED_DISMISS_MSG);
+    }
     owner_->Update(false);
   }
 
  private:
   void LayoutDetailedView() {
     views::ImageButton* close_button = new views::ImageButton(this);
     close_button->SetImage(
         views::CustomButton::STATE_NORMAL,
         ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
             IDR_AURA_UBER_TRAY_SMS_DISMISS));
@@ skipping 77 matching lines @@
       preferred_size.set_height(kMessageListMinHeight);
     return preferred_size;
   }
 
  private:
   void UpdateMessageList() {
     const base::ListValue& messages =
         static_cast<TraySms*>(owner())->messages();
     scroll_content()->RemoveAllChildViews(true);
     for (size_t index = 0; index < messages.GetSize(); ++index) {
-      const base::DictionaryValue* message = NULL;
+      const base::DictionaryValue* message = nullptr;
       if (!messages.GetDictionary(index, &message)) {
         LOG(ERROR) << "SMS message not a dictionary at: " << index;
         continue;
       }
       std::string number, text;
       if (!GetMessageFromDictionary(message, &number, &text)) {
         LOG(ERROR) << "Error parsing SMS message";
         continue;
       }
       SmsMessageView* msgview = new SmsMessageView(
@@ skipping 29 matching lines @@
   void Update(size_t message_index,
               const std::string& number,
               const std::string& text) {
     SmsMessageView* message_view =
         new SmsMessageView(tray_sms(), SmsMessageView::VIEW_NOTIFICATION,
                            message_index_, number, text);
     UpdateView(message_view);
   }
 
   // Overridden from TrayNotificationView:
-  void OnClose() override { tray_sms()->RemoveMessage(message_index_); }
+  void OnClose() override {
+    if (tray_sms()->RemoveMessage(message_index_)) {
+      WmShell::Get()->RecordUserMetricsAction(
+          UMA_STATUS_AREA_SMS_NOTIFICATION_DISMISS_MSG);
+    }
+  }
 
   void OnClickAction() override { owner()->PopupDetailedView(0, true); }
 
  private:
   TraySms* tray_sms() { return static_cast<TraySms*>(owner()); }
 
   size_t message_index_;
 
   DISALLOW_COPY_AND_ASSIGN(SmsNotificationView);
 };
 
 TraySms::TraySms(SystemTray* system_tray)
     : SystemTrayItem(system_tray),
-      default_(NULL),
-      detailed_(NULL),
-      notification_(NULL) {
+      default_(nullptr),
+      detailed_(nullptr),
+      notification_(nullptr) {
   // TODO(armansito): SMS could be a special case for cellular that requires a
   // user (perhaps the owner) to be logged in. If that is the case, then an
   // additional check should be done before subscribing for SMS notifications.
   if (chromeos::NetworkHandler::IsInitialized())
     chromeos::NetworkHandler::Get()->network_sms_handler()->AddObserver(this);
 }
 
 TraySms::~TraySms() {
   if (chromeos::NetworkHandler::IsInitialized()) {
     chromeos::NetworkHandler::Get()->network_sms_handler()->RemoveObserver(
         this);
   }
 }
 
 views::View* TraySms::CreateDefaultView(LoginStatus status) {
-  CHECK(default_ == NULL);
+  CHECK(default_ == nullptr);
   default_ = new SmsDefaultView(this);
   default_->SetVisible(!messages_.empty());
   return default_;
 }
 
 views::View* TraySms::CreateDetailedView(LoginStatus status) {
-  CHECK(detailed_ == NULL);
+  CHECK(detailed_ == nullptr);
   HideNotificationView();
   if (messages_.empty())
-    return NULL;
+    return nullptr;
   detailed_ = new SmsDetailedView(this);
+  WmShell::Get()->RecordUserMetricsAction(UMA_STATUS_AREA_DETAILED_SMS_VIEW);
   return detailed_;
 }
 
 views::View* TraySms::CreateNotificationView(LoginStatus status) {
-  CHECK(notification_ == NULL);
+  CHECK(notification_ == nullptr);
   if (detailed_)
-    return NULL;
+    return nullptr;
   size_t index;
   std::string number, text;
   if (GetLatestMessage(&index, &number, &text))
     notification_ = new SmsNotificationView(this, index, number, text);
   return notification_;
 }
 
 void TraySms::DestroyDefaultView() {
-  default_ = NULL;
+  default_ = nullptr;
 }
 
 void TraySms::DestroyDetailedView() {
-  detailed_ = NULL;
+  detailed_ = nullptr;
 }
 
 void TraySms::DestroyNotificationView() {
-  notification_ = NULL;
+  notification_ = nullptr;
 }
 
 void TraySms::MessageReceived(const base::DictionaryValue& message) {
   std::string message_text;
   if (!message.GetStringWithoutPathExpansion(
           chromeos::NetworkSmsHandler::kTextKey, &message_text)) {
     NET_LOG_ERROR("SMS message contains no content.", "");
     return;
   }
   // TODO(armansito): A message might be due to a special "Message Waiting"
@@ skipping 29 matching lines @@
   base::DictionaryValue* message;
   size_t message_index = messages_.GetSize() - 1;
   if (!messages_.GetDictionary(message_index, &message))
     return false;
   if (!GetMessageFromDictionary(message, number, text))
     return false;
   *index = message_index;
   return true;
 }
 
-void TraySms::RemoveMessage(size_t index) {
-  if (index < messages_.GetSize())
-    messages_.Remove(index, NULL);
+bool TraySms::RemoveMessage(size_t index) {
+  if (index >= messages_.GetSize())
+    return false;
+  messages_.Remove(index, nullptr);
+  return true;
 }
 
 void TraySms::Update(bool notify) {
   if (messages_.empty()) {
     if (default_)
       default_->SetVisible(false);
     if (detailed_)
       HideDetailedView();
     HideNotificationView();
   } else {
     if (default_) {
       default_->SetVisible(true);
       default_->Update();
     }
     if (detailed_)
       detailed_->Update();
     if (notification_) {
       size_t index;
       std::string number, text;
       if (GetLatestMessage(&index, &number, &text))
         notification_->Update(index, number, text);
     } else if (notify) {
       ShowNotificationView();
     }
   }
 }
 
 }  // namespace ash