Added Launcher_SwitchTask UMA user action.

ash/shelf/shelf_view.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/shelf/shelf_view.h"
 
 #include <algorithm>
 
 #include "ash/ash_constants.h"
 #include "ash/ash_switches.h"
 #include "ash/drag_drop/drag_image_view.h"
 #include "ash/metrics/user_metrics_recorder.h"
 #include "ash/root_window_controller.h"
 #include "ash/scoped_target_root_window.h"
 #include "ash/shelf/app_list_button.h"
 #include "ash/shelf/overflow_bubble.h"
 #include "ash/shelf/overflow_bubble_view.h"
 #include "ash/shelf/overflow_button.h"
 #include "ash/shelf/shelf_button.h"
 #include "ash/shelf/shelf_constants.h"
 #include "ash/shelf/shelf_delegate.h"
 #include "ash/shelf/shelf_icon_observer.h"
-#include "ash/shelf/shelf_item_delegate.h"
 #include "ash/shelf/shelf_item_delegate_manager.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shelf/shelf_menu_model.h"
 #include "ash/shelf/shelf_model.h"
 #include "ash/shelf/shelf_tooltip_manager.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
 #include "ash/wm/coordinate_conversion.h"
 #include "base/auto_reset.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 268 matching lines @@
       button->ClearState(ShelfButton::STATE_ATTENTION);
       break;
     case STATUS_ATTENTION:
       button->ClearState(ShelfButton::STATE_ACTIVE);
       button->ClearState(ShelfButton::STATE_RUNNING);
       button->AddState(ShelfButton::STATE_ATTENTION);
       break;
   }
 }
 
-void RecordIconActivatedAction(const ui::Event& event) {
-  if (event.IsMouseEvent()) {
-    Shell::GetInstance()->metrics()->RecordUserMetricsAction(
-        UMA_LAUNCHER_BUTTON_PRESSED_WITH_MOUSE);
-  } else if (event.IsGestureEvent()) {
-    Shell::GetInstance()->metrics()->RecordUserMetricsAction(
-        UMA_LAUNCHER_BUTTON_PRESSED_WITH_TOUCH);
-  }
-}
-
 }  // namespace
 
 // AnimationDelegate used when deleting an item. This steadily decreased the
 // opacity of the layer as the animation progress.
 class ShelfView::FadeOutAnimationDelegate : public gfx::AnimationDelegate {
  public:
   FadeOutAnimationDelegate(ShelfView* host, views::View* view)
       : shelf_view_(host),
         view_(view) {}
   ~FadeOutAnimationDelegate() override {}
@@ skipping 1354 matching lines @@
   return item_delegate->GetTitle();
 }
 
 void ShelfView::ButtonPressed(views::Button* sender, const ui::Event& event) {
   // Do not handle mouse release during drag.
   if (dragging())
     return;
 
   if (sender == overflow_button_) {
     ToggleOverflowBubble();
-    RecordIconActivatedAction(event);
+    RecordIconActivatedSource(event);
     return;
   }
 
   int view_index = view_model_->GetIndexOfView(sender);
   // May be -1 while in the process of animating closed.
   if (view_index == -1)
     return;
 
   // If the menu was just closed by the same event as this one, we ignore
   // the call and don't open the menu again. See crbug.com/343005 for more
@@ skipping 38 matching lines @@
 
       case TYPE_APP_PANEL:
       case TYPE_DIALOG:
         break;
 
       case TYPE_UNDEFINED:
         NOTREACHED() << "ShelfItemType must be set.";
         break;
     }
 
-    RecordIconActivatedAction(event);
+    RecordIconActivatedSource(event);
 
-    switch (item_manager_->GetShelfItemDelegate(model_->items()[view_index].id)
-                ->ItemSelected(event)) {
-      case ShelfItemDelegate::kNoAction:
-      case ShelfItemDelegate::kExistingWindowActivated:
-      case ShelfItemDelegate::kExistingWindowMinimized:
-      case ShelfItemDelegate::kAppListMenuShown:
-        ShowListMenuForView(model_->items()[view_index], sender, event);
-        break;
-      case ShelfItemDelegate::kNewWindowCreated:
-        Shell::GetInstance()->metrics()->RecordUserMetricsAction(
-            UMA_LAUNCHER_LAUNCH_TASK);
-        break;
-    }
+    ShelfItemDelegate::PerformedAction performed_action =
+        item_manager_->GetShelfItemDelegate(model_->items()[view_index].id)
+            ->ItemSelected(event);
+
+    RecordIconActivatedAction(performed_action);
+
+    if (performed_action != ShelfItemDelegate::kNewWindowCreated)
+      ShowListMenuForView(model_->items()[view_index], sender, event);
   }
 }
 
+void ShelfView::RecordIconActivatedSource(const ui::Event& event) {
+  if (event.IsMouseEvent()) {
+    Shell::GetInstance()->metrics()->RecordUserMetricsAction(
+        UMA_LAUNCHER_BUTTON_PRESSED_WITH_MOUSE);
+  } else if (event.IsGestureEvent()) {
+    Shell::GetInstance()->metrics()->RecordUserMetricsAction(
+        UMA_LAUNCHER_BUTTON_PRESSED_WITH_TOUCH);
+  }
+}
+
+void ShelfView::RecordIconActivatedAction(
+    ShelfItemDelegate::PerformedAction performed_action) {
+  switch (performed_action) {
+    case ShelfItemDelegate::kNoAction:
+    case ShelfItemDelegate::kExistingWindowMinimized:
+    case ShelfItemDelegate::kAppListMenuShown:
+      break;
+    case ShelfItemDelegate::kNewWindowCreated:
+      Shell::GetInstance()->metrics()->RecordUserMetricsAction(
+          UMA_LAUNCHER_LAUNCH_TASK);
+      break;
+    case ShelfItemDelegate::kExistingWindowActivated:
+      Shell::GetInstance()->metrics()->RecordUserMetricsAction(
+          UMA_LAUNCHER_SWITCH_TASK);
+      break;
+  }
+}
+
 bool ShelfView::ShowListMenuForView(const ShelfItem& item,
                                     views::View* source,
                                     const ui::Event& event) {
   ShelfItemDelegate* item_delegate =
       item_manager_->GetShelfItemDelegate(item.id);
   scoped_ptr<ui::MenuModel> list_menu_model(
       item_delegate->CreateApplicationMenu(event.flags()));
 
   // Make sure we have a menu and it has at least two items in addition to the
   // application title and the 3 spacing separators.
@@ skipping 196 matching lines @@
       distance = bounds.x() - coordinate.x();
       break;
     case SHELF_ALIGNMENT_TOP:
       distance = coordinate.y() - bounds.bottom();
       break;
   }
   return distance > 0 ? distance : 0;
 }
 
 }  // namespace ash