Added UMA statistics for changing the active window via click or touch events.

ash/shell.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/shell.h"
 
 #include <algorithm>
 #include <string>
 
 #include "ash/accelerators/accelerator_controller.h"
@@ skipping 15 matching lines @@
 #include "ash/first_run/first_run_helper_impl.h"
 #include "ash/focus_cycler.h"
 #include "ash/frame/custom_frame_view_ash.h"
 #include "ash/gpu_support.h"
 #include "ash/high_contrast/high_contrast_controller.h"
 #include "ash/host/ash_window_tree_host_init_params.h"
 #include "ash/keyboard_uma_event_filter.h"
 #include "ash/magnifier/magnification_controller.h"
 #include "ash/magnifier/partial_magnification_controller.h"
 #include "ash/media_delegate.h"
+#include "ash/metrics/screen_event_task_switch_metric_recorder.h"
 #include "ash/new_window_delegate.h"
 #include "ash/root_window_controller.h"
 #include "ash/session/session_state_delegate.h"
 #include "ash/shelf/app_list_shelf_item_delegate.h"
 #include "ash/shelf/shelf_delegate.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_model.h"
 #include "ash/shelf/shelf_widget.h"
@@ skipping 59 matching lines @@
 #include "ui/views/focus/focus_manager_factory.h"
 #include "ui/views/widget/native_widget_aura.h"
 #include "ui/views/widget/widget.h"
 #include "ui/wm/core/accelerator_filter.h"
 #include "ui/wm/core/compound_event_filter.h"
 #include "ui/wm/core/focus_controller.h"
 #include "ui/wm/core/input_method_event_filter.h"
 #include "ui/wm/core/nested_accelerator_controller.h"
 #include "ui/wm/core/shadow_controller.h"
 #include "ui/wm/core/visibility_controller.h"
+#include "ui/wm/core/window_activation_pre_target_handler.h"
 #include "ui/wm/core/window_modality_controller.h"
 
 #if defined(OS_CHROMEOS)
 #if defined(USE_X11)
 #include "ui/gfx/x/x11_types.h"
 #endif  // defined(USE_X11)
 #include "ash/accelerators/magnifier_key_scroller.h"
 #include "ash/accelerators/spoken_feedback_toggler.h"
 #include "ash/ash_constants.h"
 #include "ash/content/display/display_color_manager_chromeos.h"
@@ skipping 630 matching lines @@
   // |shelf_window_watcher_| has a weak pointer to |shelf_Model_|
   // and has window observers.
   shelf_window_watcher_.reset();
 
   // Destroy all child windows including widgets.
   display_controller_->CloseChildWindows();
 
   // Chrome implementation of shelf delegate depends on FocusClient,
   // so must be deleted before |focus_client_|.
   shelf_delegate_.reset();
+  window_activation_pretarget_handler_->RemoveObserver(
+      screen_event_task_switch_metric_recorder_.get());
+  screen_event_task_switch_metric_recorder_.reset();
+  // TODO(bruthig): Investigate why the |window_activation_pretarget_handler_|
+  // is not removed from pre-target handler lists.
+  window_activation_pretarget_handler_.reset();
   focus_client_.reset();
 
   // Destroy SystemTrayNotifier after destroying SystemTray as TrayItems
   // needs to remove observers from it.
   system_tray_notifier_.reset();
 
   // These need a valid Shell instance to clean up properly, so explicitly
   // delete them before invalidating the instance.
   // Alphabetical. TODO(oshima): sort.
   magnification_controller_.reset();
@@ skipping 112 matching lines @@
 
   env_filter_.reset(new ::wm::CompoundEventFilter);
   AddPreTargetHandler(env_filter_.get());
 
   wm::AshFocusRules* focus_rules = new wm::AshFocusRules();
 
   ::wm::FocusController* focus_controller =
       new ::wm::FocusController(focus_rules);
   focus_client_.reset(focus_controller);
   activation_client_ = focus_controller;
+  window_activation_pretarget_handler_.reset(
+      new ::wm::WindowActivationPreTargetHandler(activation_client_));
+  screen_event_task_switch_metric_recorder_.reset(
+      new ScreenEventTaskSwitchMetricRecorder(user_metrics_recorder_.get()));
+  window_activation_pretarget_handler_->AddObserver(
+      screen_event_task_switch_metric_recorder_.get());
   activation_client_->AddObserver(this);
   focus_cycler_.reset(new FocusCycler());
 
   screen_position_controller_.reset(new ScreenPositionController);
 
   display_controller_->Start();
   display_controller_->CreatePrimaryHost(
       ShellInitParamsToAshWindowTreeHostInitParams(init_params));
   aura::Window* root_window = display_controller_->GetPrimaryRootWindow();
   target_root_window_ = root_window;
@@ skipping 197 matching lines @@
 }
 
 void Shell::InitRootWindow(aura::Window* root_window) {
   DCHECK(activation_client_);
   DCHECK(visibility_controller_.get());
   DCHECK(drag_drop_controller_.get());
 
   aura::client::SetFocusClient(root_window, focus_client_.get());
   input_method_filter_->SetInputMethodPropertyInRootWindow(root_window);
   aura::client::SetActivationClient(root_window, activation_client_);
-  ::wm::FocusController* focus_controller =
-      static_cast< ::wm::FocusController*>(activation_client_);
-  root_window->AddPreTargetHandler(focus_controller);
+  root_window->AddPreTargetHandler(window_activation_pretarget_handler_.get());
   aura::client::SetVisibilityClient(root_window, visibility_controller_.get());
   aura::client::SetDragDropClient(root_window, drag_drop_controller_.get());
   aura::client::SetScreenPositionClient(root_window,
                                         screen_position_controller_.get());
   aura::client::SetCursorClient(root_window, &cursor_manager_);
   aura::client::SetTooltipClient(root_window, tooltip_controller_.get());
   aura::client::SetEventClient(root_window, event_client_.get());
 
   aura::client::SetWindowMoveClient(root_window,
       toplevel_window_event_handler_.get());
@@ skipping 49 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // Shell, aura::client::ActivationChangeObserver implementation:
 
 void Shell::OnWindowActivated(aura::Window* gained_active,
                               aura::Window* lost_active) {
   if (gained_active)
     target_root_window_ = gained_active->GetRootWindow();
 }
 
 }  // namespace ash