Move UserActivityDetector to ui/base/user_activity/.

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"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/cursor_client.h"
 #include "ui/aura/client/default_capture_client.h"
 #include "ui/aura/env.h"
 #include "ui/aura/test/test_screen.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/aura/window_tree_host_observer.h"
 #include "ui/base/cursor/cursor.h"
 #include "ui/base/cursor/image_cursors.h"
+#include "ui/base/user_activity/user_activity_detector.h"
 #include "ui/chromeos/user_activity_power_manager_notifier.h"
 #include "ui/display/chromeos/display_configurator.h"
 #include "ui/display/types/display_mode.h"
 #include "ui/display/types/display_snapshot.h"
 #include "ui/events/devices/device_data_manager.h"
 #include "ui/events/devices/input_device_event_observer.h"
 #include "ui/events/devices/touchscreen_device.h"
 #include "ui/gfx/screen.h"
 #include "ui/wm/core/compound_event_filter.h"
 #include "ui/wm/core/cursor_manager.h"
 #include "ui/wm/core/input_method_event_filter.h"
 #include "ui/wm/core/native_cursor_manager.h"
 #include "ui/wm/core/native_cursor_manager_delegate.h"
-#include "ui/wm/core/user_activity_detector.h"
 
 namespace athena {
 
 namespace {
 
 AthenaEnv* instance = nullptr;
 
 // Screen object used during shutdown.
 gfx::Screen* screen_for_shutdown = nullptr;
 
@@ skipping 193 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);
+    user_activity_detector_.reset(new ui::UserActivityDetector);
     host_->event_processor()->GetRootTarget()->AddPreTargetHandler(
         user_activity_detector_.get());
     user_activity_notifier_.reset(new ui::UserActivityPowerManagerNotifier(
         user_activity_detector_.get()));
 
     host_->AddObserver(this);
     host_->Show();
 
     DCHECK(!instance);
     instance = this;
@@ skipping 129 matching lines @@
                             framebuffer_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::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