Move UserActivityDetector to ui/base/user_activity/.

ash/shell.h

 // 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.
 
 #ifndef ASH_SHELL_H_
 #define ASH_SHELL_H_
 
 #include <utility>
 #include <vector>
 
@@ skipping 39 matching lines @@
 
 namespace gfx {
 class ImageSkia;
 class Point;
 class Rect;
 }
 
 namespace ui {
 class DisplayConfigurator;
 class Layer;
+class UserActivityDetector;
 class UserActivityPowerManagerNotifier;
 }
 namespace views {
 class NonClientFrameView;
 class Widget;
 namespace corewm {
 class TooltipController;
 }
 }
 
 namespace wm {
 class AcceleratorFilter;
 class CompoundEventFilter;
 class InputMethodEventFilter;
 class NestedAcceleratorController;
 class ShadowController;
 class VisibilityController;
-class UserActivityDetector;
 class WindowModalityController;
 }
 
 namespace ash {
 
 class AcceleratorController;
 class AccessibilityDelegate;
 class AppListController;
 class AshNativeCursorManager;
 class AutoclickController;
@@ skipping 50 matching lines @@
 class StatusAreaWidget;
 class StickyKeysController;
 class SystemGestureEventFilter;
 class SystemModalContainerEventFilter;
 class SystemTray;
 class SystemTrayDelegate;
 class SystemTrayNotifier;
 class ToplevelWindowEventHandler;
 class TouchTransformerController;
 class TouchObserverHUD;
-class UserActivityDetector;
 class UserWallpaperDelegate;
 class VirtualKeyboardController;
 class VideoActivityNotifier;
 class VideoDetector;
 class WebNotificationTray;
 class WindowCycleController;
 class WindowPositioner;
 class WindowSelectorController;
 
 namespace shell {
@@ skipping 506 matching lines @@
   scoped_ptr<DragDropController> drag_drop_controller_;
   scoped_ptr<ResizeShadowController> resize_shadow_controller_;
   scoped_ptr< ::wm::ShadowController> shadow_controller_;
   scoped_ptr< ::wm::VisibilityController> visibility_controller_;
   scoped_ptr< ::wm::WindowModalityController> window_modality_controller_;
   scoped_ptr<views::corewm::TooltipController> tooltip_controller_;
   scoped_ptr<DesktopBackgroundController> desktop_background_controller_;
   scoped_ptr<PowerButtonController> power_button_controller_;
   scoped_ptr<LockStateController> lock_state_controller_;
   scoped_ptr<MruWindowTracker> mru_window_tracker_;
-  scoped_ptr< ::wm::UserActivityDetector> user_activity_detector_;
+  scoped_ptr<ui::UserActivityDetector> user_activity_detector_;
   scoped_ptr<VideoDetector> video_detector_;
   scoped_ptr<WindowCycleController> window_cycle_controller_;
   scoped_ptr<WindowSelectorController> window_selector_controller_;
   scoped_ptr<FocusCycler> focus_cycler_;
   scoped_ptr<DisplayController> display_controller_;
   scoped_ptr<HighContrastController> high_contrast_controller_;
   scoped_ptr<MagnificationController> magnification_controller_;
   scoped_ptr<PartialMagnificationController> partial_magnification_controller_;
   scoped_ptr<AutoclickController> autoclick_controller_;
   scoped_ptr<aura::client::FocusClient> focus_client_;
@@ skipping 83 matching lines @@
 
   // Injected content::GPUDataManager support.
   scoped_ptr<GPUSupport> gpu_support_;
 
   DISALLOW_COPY_AND_ASSIGN(Shell);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SHELL_H_