Make UserActivityDetector a singleton

chrome/browser/chromeos/chrome_browser_main_chromeos.cc

 // Copyright (c) 2013 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 "chrome/browser/chromeos/chrome_browser_main_chromeos.h"
 
 #include <string>
 #include <vector>
 
 #include "ash/ash_switches.h"
@@ skipping 99 matching lines @@
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/power_save_blocker.h"
 #include "content/public/common/main_function_params.h"
 #include "media/audio/sounds/sounds_manager.h"
 #include "net/base/network_change_notifier.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "ui/base/touch/touch_device.h"
 #include "ui/events/event_utils.h"
+#include "ui/wm/core/user_activity_detector.h"
 
 // Exclude X11 dependents for ozone
 #if defined(USE_X11)
 #include "chrome/browser/chromeos/device_uma.h"
 #include "chrome/browser/chromeos/events/system_key_event_listener.h"
 #include "chrome/browser/chromeos/events/xinput_hierarchy_changed_event_listener.h"
 #endif
 
 #if !defined(USE_ATHENA)
 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_idle_logout.h"
@@ skipping 264 matching lines @@
     // Load the default app order synchronously for restarting case.
     app_order_loader_.reset(
         new default_app_order::ExternalLoader(false /* async */));
   }
 
   if (!app_order_loader_) {
     app_order_loader_.reset(
         new default_app_order::ExternalLoader(true /* async */));
   }
 
+  // Initialize the UserActivityDetector before the ash Shell is created.
+  wm::UserActivityDetector::Create();
+
   media::SoundsManager::Create();
 
   // Initialize magnification manager before ash tray is created. And this must
   // be placed after UserManager::SessionStarted();
   AccessibilityManager::Initialize();
 #if !defined(USE_ATHENA)
   // TODO(oshima): MagnificationManager/WallpaperManager depends on ash.
   // crbug.com/408733, crbug.com/408734.
   MagnificationManager::Initialize();
 
@@ skipping 313 matching lines @@
   idle_action_warning_observer_.reset();
 
 #if !defined(USE_ATHENA)
   MagnificationManager::Shutdown();
 #endif
 
   AccessibilityManager::Shutdown();
 
   media::SoundsManager::Shutdown();
 
+  wm::UserActivityDetector::Shutdown();
+
   system::StatisticsProvider::GetInstance()->Shutdown();
 
   // Let the UserManager and WallpaperManager unregister itself as an observer
   // of the CrosSettings singleton before it is destroyed. This also ensures
   // that the UserManager has no URLRequest pending (see
   // http://crbug.com/276659).
   g_browser_process->platform_part()->user_manager()->Shutdown();
 #if !defined(USE_ATHENA)
   WallpaperManager::Get()->Shutdown();
 #endif
@@ skipping 35 matching lines @@
   // Destroy DBus services immediately after threads are stopped.
   dbus_services_.reset();
 
   ChromeBrowserMainPartsLinux::PostDestroyThreads();
 
   // Destroy DeviceSettingsService after g_browser_process.
   DeviceSettingsService::Shutdown();
 }
 
 }  //  namespace chromeos