Make UserActivityDetector a singleton

athena/env/athena_env_impl.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 "athena/env/public/athena_env.h"
 
 #include <vector>
 
 #include "athena/util/fill_layout_manager.h"
 #include "base/sys_info.h"
@@ skipping 179 matching lines @@
     root_window->SetLayoutManager(new FillLayoutManager(root_window));
 
     cursor_manager_.reset(
         new wm::CursorManager(scoped_ptr<wm::NativeCursorManager>(
             new AthenaNativeCursorManager(host_.get()))));
     cursor_manager_->SetDisplay(
         gfx::Screen::GetNativeScreen()->GetPrimaryDisplay());
     cursor_manager_->SetCursor(ui::kCursorPointer);
     aura::client::SetCursorClient(host_->window(), cursor_manager_.get());
 
-    user_activity_detector_.reset(new wm::UserActivityDetector);
     host_->event_processor()->GetRootTarget()->AddPreTargetHandler(
-        user_activity_detector_.get());
+        wm::UserActivityDetector::Get());
     user_activity_notifier_.reset(new ui::UserActivityPowerManagerNotifier(
-        user_activity_detector_.get()));
+        wm::UserActivityDetector::Get()));
 
     host_->AddObserver(this);
     host_->Show();
 
     DCHECK(!instance);
     instance = this;
   }
 
   ~AthenaEnvImpl() override {
     instance = nullptr;
 
     host_->RemoveObserver(this);
     if (input_method_filter_)
       root_window_event_filter_->RemoveHandler(input_method_filter_.get());
-    if (user_activity_detector_) {
-      host_->event_processor()->GetRootTarget()->RemovePreTargetHandler(
-          user_activity_detector_.get());
-    }
+    host_->event_processor()->GetRootTarget()->RemovePreTargetHandler(
+        wm::UserActivityDetector::Get());
     root_window_event_filter_.reset();
     capture_client_.reset();
     input_method_filter_.reset();
     cursor_manager_.reset();
     user_activity_notifier_.reset();
-    user_activity_detector_.reset();
 
     input_method_filter_.reset();
     host_.reset();
 
     ScreenForShutdown::Create(screen_.get());
     screen_.reset();
     aura::Env::DeleteInstance();
 
     display_configurator_->RemoveObserver(this);
     display_configurator_.reset();
@@ skipping 67 matching lines @@
     return mode ? mode->size() : gfx::Size();
   }
 
   scoped_ptr<aura::TestScreen> screen_;
   scoped_ptr<aura::WindowTreeHost> host_;
 
   scoped_ptr<wm::InputMethodEventFilter> input_method_filter_;
   scoped_ptr<wm::CompoundEventFilter> root_window_event_filter_;
   scoped_ptr<aura::client::DefaultCaptureClient> capture_client_;
   scoped_ptr<wm::CursorManager> cursor_manager_;
-  scoped_ptr<wm::UserActivityDetector> user_activity_detector_;
   scoped_ptr<ui::DisplayConfigurator> display_configurator_;
   scoped_ptr<ui::UserActivityPowerManagerNotifier> user_activity_notifier_;
 
   std::vector<base::Closure> terminating_callbacks_;
 
   DISALLOW_COPY_AND_ASSIGN(AthenaEnvImpl);
 };
 
 }  // namespace
 
@@ skipping 10 matching lines @@
 
 // static
 
 // static
 void AthenaEnv::Shutdown() {
   DCHECK(instance);
   delete instance;
 }
 
 }  // namespace athena