Make UserActivityDetector a singleton

extensions/shell/browser/shell_browser_main_parts.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_browser_main_parts.h"
 
 #include "base/command_line.h"
 #include "base/run_loop.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
 #include "components/omaha_query_params/omaha_query_params.h"
@@ skipping 15 matching lines @@
 #include "extensions/shell/browser/shell_extension_system_factory.h"
 #include "extensions/shell/browser/shell_extensions_browser_client.h"
 #include "extensions/shell/browser/shell_oauth2_token_service.h"
 #include "extensions/shell/browser/shell_omaha_query_params_delegate.h"
 #include "extensions/shell/common/shell_extensions_client.h"
 #include "extensions/shell/common/switches.h"
 #include "ui/aura/env.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/ime/input_method_initializer.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/wm/core/user_activity_detector.h"
 
 #if !defined(OS_ANDROID) && !defined(OS_IOS)
 #include "components/storage_monitor/storage_monitor.h"
 #endif
 
 #if defined(OS_CHROMEOS)
 #include "chromeos/audio/cras_audio_handler.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/network/network_handler.h"
 #include "extensions/shell/browser/shell_audio_controller_chromeos.h"
@@ skipping 71 matching lines @@
 void ShellBrowserMainParts::PreMainMessageLoopRun() {
   // Initialize our "profile" equivalent.
   browser_context_.reset(new ShellBrowserContext(net_log_.get()));
 
   aura::Env::GetInstance()->set_context_factory(content::GetContextFactory());
 
 #if !defined(OS_ANDROID) && !defined(OS_IOS)
   storage_monitor::StorageMonitor::Create();
 #endif
 
+  // UserActivityDetector must be created prior to |desktop_controller_|.
+  wm::UserActivityDetector::Create();
+
   desktop_controller_.reset(browser_main_delegate_->CreateDesktopController());
 
   // NOTE: Much of this is culled from chrome/test/base/chrome_test_suite.cc
   // TODO(jamescook): Initialize user_manager::UserManager.
   net_log_.reset(new content::ShellNetLog("app_shell"));
 
   device_client_.reset(new ShellDeviceClient);
 
   extensions_client_.reset(new ShellExtensionsClient());
   ExtensionsClient::Set(extensions_client_.get());
@@ skipping 71 matching lines @@
   oauth2_token_service_.reset();
   BrowserContextDependencyManager::GetInstance()->DestroyBrowserContextServices(
       browser_context_.get());
   extension_system_ = NULL;
   ExtensionsBrowserClient::Set(NULL);
   extensions_browser_client_.reset();
   browser_context_.reset();
 
   desktop_controller_.reset();
 
+  wm::UserActivityDetector::Shutdown();
+
 #if !defined(OS_ANDROID) && !defined(OS_IOS)
   storage_monitor::StorageMonitor::Destroy();
 #endif
 }
 
 void ShellBrowserMainParts::PostDestroyThreads() {
 #if defined(OS_CHROMEOS)
   audio_controller_.reset();
   chromeos::CrasAudioHandler::Shutdown();
   network_controller_.reset();
   chromeos::NetworkHandler::Shutdown();
   chromeos::DBusThreadManager::Shutdown();
 #endif
 }
 
 void ShellBrowserMainParts::CreateExtensionSystem() {
   DCHECK(browser_context_);
   extension_system_ = static_cast<ShellExtensionSystem*>(
       ExtensionSystem::Get(browser_context_.get()));
   extension_system_->InitForRegularProfile(true);
 }
 
 }  // namespace extensions