chromeos: Notify power manager about user activity.

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/focus_manager_factory.h"
@@ skipping 36 matching lines @@
 #include "ash/wm/root_window_layout_manager.h"
 #include "ash/wm/screen_dimmer.h"
 #include "ash/wm/shadow_controller.h"
 #include "ash/wm/shelf_layout_manager.h"
 #include "ash/wm/slow_animation_event_filter.h"
 #include "ash/wm/stacking_controller.h"
 #include "ash/wm/status_area_layout_manager.h"
 #include "ash/wm/system_gesture_event_filter.h"
 #include "ash/wm/system_modal_container_layout_manager.h"
 #include "ash/wm/toplevel_window_event_filter.h"
+#include "ash/wm/user_activity_detector.h"
 #include "ash/wm/video_detector.h"
 #include "ash/wm/visibility_controller.h"
 #include "ash/wm/window_cycle_controller.h"
 #include "ash/wm/window_modality_controller.h"
 #include "ash/wm/window_util.h"
 #include "ash/wm/workspace/workspace_event_filter.h"
 #include "ash/wm/workspace/workspace_layout_manager.h"
 #include "ash/wm/workspace/workspace_manager.h"
 #include "ash/wm/workspace_controller.h"
 #include "base/bind.h"
@@ skipping 514 matching lines @@
       aura::Env::GetInstance()->GetDispatcher())->AddDispatcherForRootWindow(
           output_configurator());
 #endif  // defined(OS_CHROMEOS)
 }
 
 Shell::~Shell() {
   views::FocusManagerFactory::Install(NULL);
   aura::Env::GetInstance()->cursor_manager()->set_delegate(NULL);
 
   // Please keep in same order as in Init() because it's easy to miss one.
+  RemoveEnvEventFilter(user_activity_detector_.get());
   RemoveEnvEventFilter(key_rewriter_filter_.get());
   RemoveEnvEventFilter(partial_screenshot_filter_.get());
   RemoveEnvEventFilter(input_method_filter_.get());
   RemoveEnvEventFilter(window_modality_controller_.get());
   RemoveEnvEventFilter(system_gesture_filter_.get());
   RemoveEnvEventFilter(slow_animation_filter_.get());
 #if !defined(OS_MACOSX)
   RemoveEnvEventFilter(accelerator_filter_.get());
 #endif
   if (touch_observer_hud_.get())
@@ skipping 122 matching lines @@
   root_window_->set_focus_manager(focus_manager_.get());
 
 #if !defined(OS_MACOSX)
   nested_dispatcher_controller_.reset(new NestedDispatcherController);
   aura::client::SetDispatcherClient(root_window,
                                     nested_dispatcher_controller_.get());
   accelerator_controller_.reset(new AcceleratorController);
 #endif
   shell_context_menu_.reset(new internal::ShellContextMenu);
 
-  // KeyRewriterEventFilter must be the first one.
+  // The order in which event filters are added is significant.
   DCHECK(!GetEnvEventFilterCount());
+  user_activity_detector_.reset(new UserActivityDetector);
+  AddEnvEventFilter(user_activity_detector_.get());
+
+  DCHECK_EQ(1U, GetEnvEventFilterCount());
   key_rewriter_filter_.reset(new internal::KeyRewriterEventFilter);
   AddEnvEventFilter(key_rewriter_filter_.get());
 
-  // PartialScreenshotEventFilter must be the second one to capture key
-  // events when the taking partial screenshot UI is there.
-  DCHECK_EQ(1U, GetEnvEventFilterCount());
+  DCHECK_EQ(2U, GetEnvEventFilterCount());
   partial_screenshot_filter_.reset(new internal::PartialScreenshotEventFilter);
   AddEnvEventFilter(partial_screenshot_filter_.get());
   AddShellObserver(partial_screenshot_filter_.get());
 
-  // InputMethodEventFilter must be the third one. It has to be added before
-  // AcceleratorFilter.
-  DCHECK_EQ(2U, GetEnvEventFilterCount());
+  DCHECK_EQ(3U, GetEnvEventFilterCount());
   input_method_filter_.reset(new aura::shared::InputMethodEventFilter());
   input_method_filter_->SetInputMethodPropertyInRootWindow(root_window);
   AddEnvEventFilter(input_method_filter_.get());
+
 #if !defined(OS_MACOSX)
   accelerator_filter_.reset(new internal::AcceleratorFilter);
   AddEnvEventFilter(accelerator_filter_.get());
 #endif
 
   system_gesture_filter_.reset(new internal::SystemGestureEventFilter);
   AddEnvEventFilter(system_gesture_filter_.get());
 
   slow_animation_filter_.reset(new internal::SlowAnimationEventFilter);
   AddEnvEventFilter(slow_animation_filter_.get());
@@ skipping 315 matching lines @@
 void Shell::SetCursor(gfx::NativeCursor cursor) {
   // TODO(oshima): set cursor to all root windows.
   GetPrimaryRootWindow()->SetCursor(cursor);
 }
 
 void Shell::ShowCursor(bool visible) {
   GetPrimaryRootWindow()->ShowCursor(visible);
 }
 
 }  // namespace ash