diff options
Diffstat (limited to 'chrome/browser/chromeos')
18 files changed, 38 insertions, 38 deletions
diff --git a/chrome/browser/chromeos/app_mode/kiosk_mode_idle_app_name_notification.cc b/chrome/browser/chromeos/app_mode/kiosk_mode_idle_app_name_notification.cc index 6fe3554..8bbf815 100644 --- a/chrome/browser/chromeos/app_mode/kiosk_mode_idle_app_name_notification.cc +++ b/chrome/browser/chromeos/app_mode/kiosk_mode_idle_app_name_notification.cc @@ -5,7 +5,6 @@ #include "chrome/browser/chromeos/app_mode/kiosk_mode_idle_app_name_notification.h" #include "ash/shell.h" -#include "ash/wm/user_activity_detector.h" #include "base/bind.h" #include "base/command_line.h" #include "base/logging.h" @@ -16,6 +15,7 @@ #include "chrome/common/chrome_switches.h" #include "chromeos/dbus/dbus_thread_manager.h" #include "extensions/browser/extension_system.h" +#include "ui/wm/core/user_activity_detector.h" namespace chromeos { diff --git a/chrome/browser/chromeos/app_mode/kiosk_mode_idle_app_name_notification.h b/chrome/browser/chromeos/app_mode/kiosk_mode_idle_app_name_notification.h index 6a2b2f1..9006432 100644 --- a/chrome/browser/chromeos/app_mode/kiosk_mode_idle_app_name_notification.h +++ b/chrome/browser/chromeos/app_mode/kiosk_mode_idle_app_name_notification.h @@ -5,17 +5,17 @@ #ifndef CHROME_BROWSER_CHROMEOS_APP_MODE_KIOSK_MODE_IDLE_APP_NAME_NOTIFICATION_H_ #define CHROME_BROWSER_CHROMEOS_APP_MODE_KIOSK_MODE_IDLE_APP_NAME_NOTIFICATION_H_ -#include "ash/wm/user_activity_observer.h" #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" #include "base/timer/timer.h" #include "chromeos/dbus/power_manager_client.h" +#include "ui/wm/core/user_activity_observer.h" namespace chromeos { class IdleAppNameNotificationView; -class KioskModeIdleAppNameNotification : public ash::UserActivityObserver, +class KioskModeIdleAppNameNotification : public wm::UserActivityObserver, public PowerManagerClient::Observer { public: static void Initialize(); @@ -29,7 +29,7 @@ class KioskModeIdleAppNameNotification : public ash::UserActivityObserver, // Initialize idle app message when KioskModeHelper is initialized. void Setup(); - // UserActivityObserver overrides: + // wm::UserActivityObserver overrides: virtual void OnUserActivity(const ui::Event* event) OVERRIDE; // PowerManagerClient::Observer overrides: diff --git a/chrome/browser/chromeos/dbus/display_power_service_provider.cc b/chrome/browser/chromeos/dbus/display_power_service_provider.cc index 6192952..5eac05b 100644 --- a/chrome/browser/chromeos/dbus/display_power_service_provider.cc +++ b/chrome/browser/chromeos/dbus/display_power_service_provider.cc @@ -5,12 +5,12 @@ #include "chrome/browser/chromeos/dbus/display_power_service_provider.h" #include "ash/shell.h" -#include "ash/wm/user_activity_detector.h" #include "base/bind.h" #include "dbus/bus.h" #include "dbus/message.h" #include "third_party/cros_system_api/dbus/service_constants.h" #include "ui/display/chromeos/output_configurator.h" +#include "ui/wm/core/user_activity_detector.h" namespace chromeos { diff --git a/chrome/browser/chromeos/idle_detector.cc b/chrome/browser/chromeos/idle_detector.cc index 57584a2..12e80c7 100644 --- a/chrome/browser/chromeos/idle_detector.cc +++ b/chrome/browser/chromeos/idle_detector.cc @@ -5,9 +5,9 @@ #include "chrome/browser/chromeos/idle_detector.h" #include "ash/shell.h" -#include "ash/wm/user_activity_detector.h" #include "base/bind.h" #include "base/logging.h" +#include "ui/wm/core/user_activity_detector.h" namespace chromeos { diff --git a/chrome/browser/chromeos/idle_detector.h b/chrome/browser/chromeos/idle_detector.h index 1fa47be..3b9ce77 100644 --- a/chrome/browser/chromeos/idle_detector.h +++ b/chrome/browser/chromeos/idle_detector.h @@ -5,16 +5,16 @@ #ifndef CHROME_BROWSER_CHROMEOS_IDLE_DETECTOR_H_ #define CHROME_BROWSER_CHROMEOS_IDLE_DETECTOR_H_ -#include "ash/wm/user_activity_observer.h" #include "base/basictypes.h" #include "base/callback.h" #include "base/compiler_specific.h" #include "base/time/time.h" #include "base/timer/timer.h" +#include "ui/wm/core/user_activity_observer.h" namespace chromeos { -class IdleDetector : public ash::UserActivityObserver { +class IdleDetector : public wm::UserActivityObserver { public: IdleDetector(const base::Closure& on_active_callback, const base::Closure& on_idle_callback); @@ -23,7 +23,7 @@ class IdleDetector : public ash::UserActivityObserver { void Start(const base::TimeDelta& timeout); private: - // UserActivityObserver overrides: + // wm::UserActivityObserver overrides: virtual void OnUserActivity(const ui::Event* event) OVERRIDE; // Resets |timer_| to fire when we reach our idle timeout. diff --git a/chrome/browser/chromeos/kiosk_mode/kiosk_mode_idle_logout.cc b/chrome/browser/chromeos/kiosk_mode/kiosk_mode_idle_logout.cc index d005433..7904f95d 100644 --- a/chrome/browser/chromeos/kiosk_mode/kiosk_mode_idle_logout.cc +++ b/chrome/browser/chromeos/kiosk_mode/kiosk_mode_idle_logout.cc @@ -5,7 +5,6 @@ #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_idle_logout.h" #include "ash/shell.h" -#include "ash/wm/user_activity_detector.h" #include "base/bind.h" #include "base/lazy_instance.h" #include "base/logging.h" @@ -17,6 +16,7 @@ #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_service.h" +#include "ui/wm/core/user_activity_detector.h" namespace chromeos { diff --git a/chrome/browser/chromeos/kiosk_mode/kiosk_mode_idle_logout.h b/chrome/browser/chromeos/kiosk_mode/kiosk_mode_idle_logout.h index c358277..9f9c63f 100644 --- a/chrome/browser/chromeos/kiosk_mode/kiosk_mode_idle_logout.h +++ b/chrome/browser/chromeos/kiosk_mode/kiosk_mode_idle_logout.h @@ -5,16 +5,16 @@ #ifndef CHROME_BROWSER_CHROMEOS_KIOSK_MODE_KIOSK_MODE_IDLE_LOGOUT_H_ #define CHROME_BROWSER_CHROMEOS_KIOSK_MODE_KIOSK_MODE_IDLE_LOGOUT_H_ -#include "ash/wm/user_activity_observer.h" #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/timer/timer.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" +#include "ui/wm/core/user_activity_observer.h" namespace chromeos { -class KioskModeIdleLogout : public ash::UserActivityObserver, +class KioskModeIdleLogout : public wm::UserActivityObserver, public content::NotificationObserver { public: static void Initialize(); @@ -33,7 +33,7 @@ class KioskModeIdleLogout : public ash::UserActivityObserver, const content::NotificationSource& source, const content::NotificationDetails& details) OVERRIDE; - // UserActivityObserver overrides: + // wm::UserActivityObserver overrides: virtual void OnUserActivity(const ui::Event* event) OVERRIDE; // Begins listening for user activity and calls ResetTimer(). diff --git a/chrome/browser/chromeos/kiosk_mode/kiosk_mode_idle_logout_unittest.cc b/chrome/browser/chromeos/kiosk_mode/kiosk_mode_idle_logout_unittest.cc index 9b84163..a71d5b3 100644 --- a/chrome/browser/chromeos/kiosk_mode/kiosk_mode_idle_logout_unittest.cc +++ b/chrome/browser/chromeos/kiosk_mode/kiosk_mode_idle_logout_unittest.cc @@ -6,7 +6,6 @@ #include "ash/shell.h" #include "ash/test/ash_test_base.h" -#include "ash/wm/user_activity_detector.h" #include "base/bind.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" @@ -17,6 +16,7 @@ #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_service.h" #include "testing/gtest/include/gtest/gtest.h" +#include "ui/wm/core/user_activity_detector.h" namespace chromeos { diff --git a/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.cc b/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.cc index 7219e5b..9fbdcdd 100644 --- a/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.cc +++ b/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.cc @@ -6,7 +6,6 @@ #include "ash/screensaver/screensaver_view.h" #include "ash/shell.h" -#include "ash/wm/user_activity_detector.h" #include "base/bind.h" #include "base/callback.h" #include "base/lazy_instance.h" @@ -30,6 +29,7 @@ #include "content/public/browser/notification_service.h" #include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" +#include "ui/wm/core/user_activity_detector.h" using extensions::Extension; using extensions::SandboxedUnpacker; diff --git a/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.h b/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.h index 689e25e5..3d4b7cb 100644 --- a/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.h +++ b/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.h @@ -5,10 +5,10 @@ #ifndef CHROME_BROWSER_CHROMEOS_KIOSK_MODE_KIOSK_MODE_SCREENSAVER_H_ #define CHROME_BROWSER_CHROMEOS_KIOSK_MODE_KIOSK_MODE_SCREENSAVER_H_ -#include "ash/wm/user_activity_observer.h" #include "base/basictypes.h" #include "base/files/file_path.h" #include "base/memory/weak_ptr.h" +#include "ui/wm/core/user_activity_observer.h" namespace extensions { class Extension; @@ -16,7 +16,7 @@ class Extension; namespace chromeos { -class KioskModeScreensaver : public ash::UserActivityObserver { +class KioskModeScreensaver : public wm::UserActivityObserver { public: KioskModeScreensaver(); virtual ~KioskModeScreensaver(); @@ -24,7 +24,7 @@ class KioskModeScreensaver : public ash::UserActivityObserver { private: friend class KioskModeScreensaverTest; - // UserActivityObserver overrides: + // wm::UserActivityObserver overrides: virtual void OnUserActivity(const ui::Event* event) OVERRIDE; // Initialization functions, in order diff --git a/chrome/browser/chromeos/login/webui_login_display.cc b/chrome/browser/chromeos/login/webui_login_display.cc index a0582ee..033baa2 100644 --- a/chrome/browser/chromeos/login/webui_login_display.cc +++ b/chrome/browser/chromeos/login/webui_login_display.cc @@ -5,7 +5,6 @@ #include "chrome/browser/chromeos/login/webui_login_display.h" #include "ash/shell.h" -#include "ash/wm/user_activity_detector.h" #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" #include "chrome/browser/chromeos/login/login_display_host_impl.h" #include "chrome/browser/chromeos/login/screen_locker.h" @@ -20,6 +19,7 @@ #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/views/widget/widget.h" +#include "ui/wm/core/user_activity_detector.h" namespace chromeos { @@ -34,7 +34,7 @@ const int kPasswordClearTimeoutSec = 60; WebUILoginDisplay::~WebUILoginDisplay() { if (webui_handler_) webui_handler_->ResetSigninScreenHandlerDelegate(); - ash::UserActivityDetector* activity_detector = ash::Shell::GetInstance()-> + wm::UserActivityDetector* activity_detector = ash::Shell::GetInstance()-> user_activity_detector(); if (activity_detector->HasObserver(this)) activity_detector->RemoveObserver(this); @@ -66,7 +66,7 @@ void WebUILoginDisplay::Init(const UserList& users, show_users_ = show_users; show_new_user_ = show_new_user; - ash::UserActivityDetector* activity_detector = ash::Shell::GetInstance()-> + wm::UserActivityDetector* activity_detector = ash::Shell::GetInstance()-> user_activity_detector(); if (!activity_detector->HasObserver(this)) activity_detector->AddObserver(this); diff --git a/chrome/browser/chromeos/login/webui_login_display.h b/chrome/browser/chromeos/login/webui_login_display.h index cd4fe50..717df2c 100644 --- a/chrome/browser/chromeos/login/webui_login_display.h +++ b/chrome/browser/chromeos/login/webui_login_display.h @@ -8,7 +8,6 @@ #include <string> #include <vector> -#include "ash/wm/user_activity_observer.h" #include "base/compiler_specific.h" #include "base/timer/timer.h" #include "chrome/browser/chromeos/login/login_display.h" @@ -16,13 +15,14 @@ #include "chrome/browser/ui/webui/chromeos/login/native_window_delegate.h" #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" #include "ui/views/widget/widget.h" +#include "ui/wm/core/user_activity_observer.h" namespace chromeos { // WebUI-based login UI implementation. class WebUILoginDisplay : public LoginDisplay, public NativeWindowDelegate, public SigninScreenHandlerDelegate, - public ash::UserActivityObserver { + public wm::UserActivityObserver { public: explicit WebUILoginDisplay(LoginDisplay::Delegate* delegate); virtual ~WebUILoginDisplay(); @@ -96,7 +96,7 @@ class WebUILoginDisplay : public LoginDisplay, virtual void LoginAsKioskApp(const std::string& app_id, bool diagnostic_mode) OVERRIDE; - // UserActivityDetector implementation: + // wm::UserActivityDetector implementation: virtual void OnUserActivity(const ui::Event* event) OVERRIDE; private: diff --git a/chrome/browser/chromeos/policy/recommendation_restorer.cc b/chrome/browser/chromeos/policy/recommendation_restorer.cc index 7c2ec10..5ace88d 100644 --- a/chrome/browser/chromeos/policy/recommendation_restorer.cc +++ b/chrome/browser/chromeos/policy/recommendation_restorer.cc @@ -5,7 +5,6 @@ #include "chrome/browser/chromeos/policy/recommendation_restorer.h" #include "ash/shell.h" -#include "ash/wm/user_activity_detector.h" #include "base/bind.h" #include "base/bind_helpers.h" #include "base/location.h" @@ -20,6 +19,7 @@ #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_source.h" +#include "ui/wm/core/user_activity_detector.h" namespace policy { @@ -103,7 +103,7 @@ void RecommendationRestorer::Restore(bool allow_delay, allow_delay = false; } else if (allow_delay && ash::Shell::HasInstance()) { // Skip the delay if there has been no user input since the browser started. - const ash::UserActivityDetector* user_activity_detector = + const wm::UserActivityDetector* user_activity_detector = ash::Shell::GetInstance()->user_activity_detector(); allow_delay = !user_activity_detector->last_activity_time().is_null(); } @@ -128,7 +128,7 @@ void RecommendationRestorer::StartTimer() { // active, causing it to fire only when the user remains idle for // |kRestoreDelayInMs|. if (ash::Shell::HasInstance()) { - ash::UserActivityDetector* user_activity_detector = + wm::UserActivityDetector* user_activity_detector = ash::Shell::GetInstance()->user_activity_detector(); if (!user_activity_detector->HasObserver(this)) user_activity_detector->AddObserver(this); diff --git a/chrome/browser/chromeos/policy/recommendation_restorer.h b/chrome/browser/chromeos/policy/recommendation_restorer.h index 4149ddb..c81b06e 100644 --- a/chrome/browser/chromeos/policy/recommendation_restorer.h +++ b/chrome/browser/chromeos/policy/recommendation_restorer.h @@ -7,7 +7,6 @@ #include <string> -#include "ash/wm/user_activity_observer.h" #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/prefs/pref_change_registrar.h" @@ -15,6 +14,7 @@ #include "components/keyed_service/core/keyed_service.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" +#include "ui/wm/core/user_activity_observer.h" class Profile; @@ -28,7 +28,7 @@ namespace policy { // becomes idle for one minute. class RecommendationRestorer : public KeyedService, public content::NotificationObserver, - public ash::UserActivityObserver { + public wm::UserActivityObserver { public: explicit RecommendationRestorer(Profile* profile); virtual ~RecommendationRestorer(); @@ -41,7 +41,7 @@ class RecommendationRestorer : public KeyedService, const content::NotificationSource& source, const content::NotificationDetails& details) OVERRIDE; - // ash::UserActivityObserver: + // wm::UserActivityObserver: virtual void OnUserActivity(const ui::Event* event) OVERRIDE; // If a recommended value and a user setting exist for |pref_name|, clears the diff --git a/chrome/browser/chromeos/session_length_limiter.cc b/chrome/browser/chromeos/session_length_limiter.cc index 4ea224a..4ba632a 100644 --- a/chrome/browser/chromeos/session_length_limiter.cc +++ b/chrome/browser/chromeos/session_length_limiter.cc @@ -7,7 +7,6 @@ #include <algorithm> #include "ash/shell.h" -#include "ash/wm/user_activity_detector.h" #include "base/bind.h" #include "base/bind_helpers.h" #include "base/location.h" @@ -18,6 +17,7 @@ #include "chrome/browser/lifetime/application_lifetime.h" #include "chrome/common/pref_names.h" #include "ui/events/event.h" +#include "ui/wm/core/user_activity_detector.h" namespace chromeos { diff --git a/chrome/browser/chromeos/session_length_limiter.h b/chrome/browser/chromeos/session_length_limiter.h index fb8216f..f809454 100644 --- a/chrome/browser/chromeos/session_length_limiter.h +++ b/chrome/browser/chromeos/session_length_limiter.h @@ -5,7 +5,6 @@ #ifndef CHROME_BROWSER_CHROMEOS_SESSION_LENGTH_LIMITER_H_ #define CHROME_BROWSER_CHROMEOS_SESSION_LENGTH_LIMITER_H_ -#include "ash/wm/user_activity_observer.h" #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" @@ -13,6 +12,7 @@ #include "base/threading/thread_checker.h" #include "base/time/time.h" #include "base/timer/timer.h" +#include "ui/wm/core/user_activity_observer.h" class PrefService; class PrefRegistrySimple; @@ -21,7 +21,7 @@ namespace chromeos { // Enforces a session length limit by terminating the session when the limit is // reached. -class SessionLengthLimiter : public ash::UserActivityObserver { +class SessionLengthLimiter : public wm::UserActivityObserver { public: class Delegate { public: @@ -37,7 +37,7 @@ class SessionLengthLimiter : public ash::UserActivityObserver { SessionLengthLimiter(Delegate* delegate, bool browser_restarted); virtual ~SessionLengthLimiter(); - // ash::UserActivityObserver: + // wm::UserActivityObserver: virtual void OnUserActivity(const ui::Event* event) OVERRIDE; private: diff --git a/chrome/browser/chromeos/system/automatic_reboot_manager.cc b/chrome/browser/chromeos/system/automatic_reboot_manager.cc index cdf07d4..a6b95e8 100644 --- a/chrome/browser/chromeos/system/automatic_reboot_manager.cc +++ b/chrome/browser/chromeos/system/automatic_reboot_manager.cc @@ -12,7 +12,6 @@ #include <string> #include "ash/shell.h" -#include "ash/wm/user_activity_detector.h" #include "base/bind.h" #include "base/bind_helpers.h" #include "base/callback.h" @@ -44,6 +43,7 @@ #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_source.h" +#include "ui/wm/core/user_activity_detector.h" namespace chromeos { namespace system { diff --git a/chrome/browser/chromeos/system/automatic_reboot_manager.h b/chrome/browser/chromeos/system/automatic_reboot_manager.h index 83e5398..6e1adb5 100644 --- a/chrome/browser/chromeos/system/automatic_reboot_manager.h +++ b/chrome/browser/chromeos/system/automatic_reboot_manager.h @@ -5,7 +5,6 @@ #ifndef CHROME_BROWSER_CHROMEOS_SYSTEM_AUTOMATIC_REBOOT_MANAGER_H_ #define CHROME_BROWSER_CHROMEOS_SYSTEM_AUTOMATIC_REBOOT_MANAGER_H_ -#include "ash/wm/user_activity_observer.h" #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" @@ -18,6 +17,7 @@ #include "chromeos/dbus/update_engine_client.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" +#include "ui/wm/core/user_activity_observer.h" class PrefRegistrySimple; @@ -72,7 +72,7 @@ class AutomaticRebootManagerObserver; // /var/run ensures that it gets cleared automatically on every boot. class AutomaticRebootManager : public PowerManagerClient::Observer, public UpdateEngineClient::Observer, - public ash::UserActivityObserver, + public wm::UserActivityObserver, public content::NotificationObserver { public: // The current uptime and the uptime at which an update was applied and a @@ -103,7 +103,7 @@ class AutomaticRebootManager : public PowerManagerClient::Observer, virtual void UpdateStatusChanged( const UpdateEngineClient::Status& status) OVERRIDE; - // ash::UserActivityObserver: + // wm::UserActivityObserver: virtual void OnUserActivity(const ui::Event* event) OVERRIDE; // content::NotificationObserver: |