Added Ash.SystemMenu.DefaultView.VisibleItems histogram.

ash/common/system/tray/system_tray_bubble.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/tray/system_tray_bubble.h"
 
+#include <utility>
+#include <vector>
+
 #include "ash/common/system/tray/system_tray.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
 #include "ash/common/system/tray/system_tray_item.h"
 #include "ash/common/system/tray/tray_bubble_wrapper.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/system/tray/tray_popup_item_container.h"
 #include "ash/common/wm_shell.h"
+#include "base/metrics/histogram_macros.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/layer_animation_observer.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/gfx/canvas.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
 using views::TrayBubbleView;
@@ skipping 33 matching lines @@
 
 }  // namespace
 
 // SystemTrayBubble
 
 SystemTrayBubble::SystemTrayBubble(
     ash::SystemTray* tray,
     const std::vector<ash::SystemTrayItem*>& items,
     BubbleType bubble_type)
     : tray_(tray),
-      bubble_view_(NULL),
+      bubble_view_(nullptr),
       items_(items),
       bubble_type_(bubble_type),
       autoclose_delay_(0) {}
 
 SystemTrayBubble::~SystemTrayBubble() {
   DestroyItemViews();
   // Reset the host pointer in bubble_view_ in case its destruction is deferred.
   if (bubble_view_)
     bubble_view_->reset_delegate();
 }
@@ skipping 118 matching lines @@
   if (bubble_view_->CanActivate()) {
     bubble_view_->NotifyAccessibilityEvent(ui::AX_EVENT_ALERT, true);
   }
 }
 
 void SystemTrayBubble::FocusDefaultIfNeeded() {
   views::FocusManager* manager = bubble_view_->GetFocusManager();
   if (!manager || manager->GetFocusedView())
     return;
 
-  views::View* view = manager->GetNextFocusableView(NULL, NULL, false, false);
+  views::View* view =
+      manager->GetNextFocusableView(nullptr, nullptr, false, false);
   if (view)
     view->RequestFocus();
 }
 
 void SystemTrayBubble::DestroyItemViews() {
   for (std::vector<ash::SystemTrayItem*>::iterator it = items_.begin();
        it != items_.end(); ++it) {
     switch (bubble_type_) {
       case BUBBLE_TYPE_DEFAULT:
         (*it)->DestroyDefaultView();
         break;
       case BUBBLE_TYPE_DETAILED:
         (*it)->DestroyDetailedView();
         break;
       case BUBBLE_TYPE_NOTIFICATION:
         (*it)->DestroyNotificationView();
         break;
     }
   }
 }
 
 void SystemTrayBubble::BubbleViewDestroyed() {
-  bubble_view_ = NULL;
+  bubble_view_ = nullptr;
 }
 
 void SystemTrayBubble::StartAutoCloseTimer(int seconds) {
   autoclose_.Stop();
   autoclose_delay_ = seconds;
   if (autoclose_delay_) {
     autoclose_.Start(FROM_HERE, base::TimeDelta::FromSeconds(autoclose_delay_),
                      this, &SystemTrayBubble::Close);
   }
 }
@@ skipping 27 matching lines @@
 
 bool SystemTrayBubble::ShouldShowShelf() const {
   for (std::vector<ash::SystemTrayItem*>::const_iterator it = items_.begin();
        it != items_.end(); ++it) {
     if ((*it)->ShouldShowShelf())
       return true;
   }
   return false;
 }
 
+void SystemTrayBubble::RecordVisibleRowMetrics() {
+  if (bubble_type_ != BUBBLE_TYPE_DEFAULT) {

[James Cook, 2016/07/20 20:13:49]

nit: no {}

[bruthig, 2016/07/21 14:34:58]

Done.

+    return;
+  }
+
+  for (const std::pair<SystemTrayItem::UmaType, views::View*>& pair :
+       tray_item_view_map_) {
+    if (pair.second->visible()) {
+      UMA_HISTOGRAM_ENUMERATION("Ash.SystemMenu.DefaultView.VisibleRows",
+                                pair.first, SystemTrayItem::COUNT);
+    }
+  }
+}
+
 void SystemTrayBubble::CreateItemViews(LoginStatus login_status) {
-  std::vector<views::View*> item_views;
+  tray_item_view_map_.clear();
+
   // If a system modal dialog is present, create the same tray as
   // in locked state.
   if (WmShell::Get()->IsSystemModalWindowOpen() &&
       login_status != LoginStatus::NOT_LOGGED_IN) {
     login_status = LoginStatus::LOCKED;
   }
 
-  views::View* focus_view = NULL;
+  views::View* focus_view = nullptr;
+  const bool is_default_bubble = bubble_type_ == BUBBLE_TYPE_DEFAULT;
   for (size_t i = 0; i < items_.size(); ++i) {
-    views::View* view = NULL;
+    views::View* item_view = nullptr;

[James Cook, 2016/07/20 20:13:49]

item_view is a better name, thanks for changing it!

     switch (bubble_type_) {
       case BUBBLE_TYPE_DEFAULT:
-        view = items_[i]->CreateDefaultView(login_status);
+        item_view = items_[i]->CreateDefaultView(login_status);
         if (items_[i]->restore_focus())
-          focus_view = view;
+          focus_view = item_view;
         break;
       case BUBBLE_TYPE_DETAILED:
-        view = items_[i]->CreateDetailedView(login_status);
+        item_view = items_[i]->CreateDetailedView(login_status);
         break;
       case BUBBLE_TYPE_NOTIFICATION:
-        view = items_[i]->CreateNotificationView(login_status);
+        item_view = items_[i]->CreateNotificationView(login_status);
         break;
     }
-    if (view)
-      item_views.push_back(view);
+    if (item_view) {
+      views::View* tray_popup_item_container = new TrayPopupItemContainer(
+          item_view, is_default_bubble, is_default_bubble);
+      bubble_view_->AddChildView(tray_popup_item_container);
+      tray_item_view_map_[items_[i]->uma_type()] = tray_popup_item_container;
+    }
   }
 
-  bool is_default_bubble = bubble_type_ == BUBBLE_TYPE_DEFAULT;
-  for (size_t i = 0; i < item_views.size(); ++i) {
-    // For default view, draw bottom border for each item, except the last
-    // 2 items, which are the bottom header row and the one just above it.
-    bubble_view_->AddChildView(new TrayPopupItemContainer(
-        item_views[i], is_default_bubble,
-        is_default_bubble && (i < item_views.size() - 2)));
+  // For default view, draw bottom border for each item, except the last
+  // 2 items, which are the bottom header row and the one just above it.
+  const int view_count = bubble_view_->child_count();
+  if (is_default_bubble && view_count > 1) {
+    bubble_view_->child_at(view_count - 1)
+        ->SetBorder(views::Border::NullBorder());

[James Cook, 2016/07/20 20:13:49]

It seems a bit wasteful to create the last 2 items with borders, then reset
those borders. Is there another way to do it? Just keep the approach in the old
code (and DCHECK that size() >= 2)? Or do you need single-item bubbles for
tests? (If so, comment that.)

[bruthig, 2016/07/21 14:34:58]

Done.

+    if (view_count > 2) {
+      bubble_view_->child_at(view_count - 2)
+          ->SetBorder(views::Border::NullBorder());
+    }
   }
+
   if (focus_view)
     focus_view->RequestFocus();
 }
 
 }  // namespace ash