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

extensions/shell/browser/shell_desktop_controller_aura.cc

 // Copyright 2014 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 "extensions/shell/browser/shell_desktop_controller_aura.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 17 matching lines @@
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/screen.h"
 #include "ui/wm/core/base_focus_rules.h"
 #include "ui/wm/core/compound_event_filter.h"
 #include "ui/wm/core/cursor_manager.h"
 #include "ui/wm/core/focus_controller.h"
 #include "ui/wm/core/input_method_event_filter.h"
 #include "ui/wm/core/native_cursor_manager.h"
 #include "ui/wm/core/native_cursor_manager_delegate.h"
+#include "ui/wm/core/window_activation_pre_target_handler.h"
 
 #if defined(OS_CHROMEOS)
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "ui/chromeos/user_activity_power_manager_notifier.h"
 #include "ui/display/types/display_mode.h"
 #include "ui/display/types/display_snapshot.h"
 #endif
 
 namespace extensions {
 namespace {
@@ skipping 200 matching lines @@
   DCHECK_EQ(host_.get(), host);
   CloseAppWindows();
   base::MessageLoop::current()->PostTask(FROM_HERE,
                                          base::MessageLoop::QuitClosure());
 }
 
 void ShellDesktopControllerAura::InitWindowManager() {
   wm::FocusController* focus_controller =
       new wm::FocusController(new AppsFocusRules());
   aura::client::SetFocusClient(host_->window(), focus_controller);
-  host_->window()->AddPreTargetHandler(focus_controller);
   aura::client::SetActivationClient(host_->window(), focus_controller);
   focus_client_.reset(focus_controller);
+  window_activation_pretarget_handler_.reset(
+      new wm::WindowActivationPreTargetHandler(focus_controller));
+  host_->window()->AddPreTargetHandler(
+      window_activation_pretarget_handler_.get());
 
   input_method_filter_.reset(
       new wm::InputMethodEventFilter(host_->GetAcceleratedWidget()));
   input_method_filter_->SetInputMethodPropertyInRootWindow(host_->window());
   root_window_event_filter_->AddHandler(input_method_filter_.get());
 
   capture_client_.reset(
       new aura::client::DefaultCaptureClient(host_->window()));
 
   // Ensure new windows fill the display.
@@ skipping 43 matching lines @@
   host_->AddObserver(this);
 
   // Ensure the X window gets mapped.
   host_->Show();
 }
 
 void ShellDesktopControllerAura::DestroyRootWindow() {
   host_->RemoveObserver(this);
   if (input_method_filter_)
     root_window_event_filter_->RemoveHandler(input_method_filter_.get());
-  wm::FocusController* focus_controller =
-      static_cast<wm::FocusController*>(focus_client_.get());
-  if (focus_controller) {
-    host_->window()->RemovePreTargetHandler(focus_controller);
+  if (window_activation_pretarget_handler_) {
+    host_->window()->RemovePreTargetHandler(
+        window_activation_pretarget_handler_.get());
     aura::client::SetActivationClient(host_->window(), NULL);
+    window_activation_pretarget_handler_.reset();
   }
   root_window_event_filter_.reset();
   capture_client_.reset();
   input_method_filter_.reset();
   focus_client_.reset();
   cursor_manager_.reset();
 #if defined(OS_CHROMEOS)
   user_activity_notifier_.reset();
 #endif
   user_activity_detector_.reset();
   host_.reset();
   screen_.reset();
 }
 
 gfx::Size ShellDesktopControllerAura::GetPrimaryDisplaySize() {
 #if defined(OS_CHROMEOS)
   const ui::DisplayConfigurator::DisplayStateList& displays =
       display_configurator_->cached_displays();
   if (displays.empty())
     return gfx::Size();
   const ui::DisplayMode* mode = displays[0]->current_mode();
   return mode ? mode->size() : gfx::Size();
 #else
   return gfx::Size();
 #endif
 }
 
 }  // namespace extensions