summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/chromeos/kiosk_mode/kiosk_mode_idle_logout.cc2
-rw-r--r--chrome/browser/chromeos/kiosk_mode/kiosk_mode_idle_logout.h4
-rw-r--r--chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.cc2
-rw-r--r--chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.h4
-rw-r--r--chrome/browser/chromeos/login/webui_login_display.cc2
-rw-r--r--chrome/browser/chromeos/login/webui_login_display.h2
-rw-r--r--chrome/browser/chromeos/policy/recommendation_restorer.cc2
-rw-r--r--chrome/browser/chromeos/policy/recommendation_restorer.h4
-rw-r--r--chrome/browser/chromeos/policy/recommendation_restorer_unittest.cc2
-rw-r--r--chrome/browser/chromeos/power/user_activity_notifier.cc21
-rw-r--r--chrome/browser/chromeos/power/user_activity_notifier.h2
-rw-r--r--chrome/browser/chromeos/screensaver/screensaver_controller.cc2
-rw-r--r--chrome/browser/chromeos/screensaver/screensaver_controller.h4
-rw-r--r--chrome/browser/chromeos/screensaver/screensaver_controller_browsertest.cc6
-rw-r--r--chrome/browser/chromeos/system/automatic_reboot_manager.cc4
-rw-r--r--chrome/browser/chromeos/system/automatic_reboot_manager.h2
-rw-r--r--chrome/browser/chromeos/system/automatic_reboot_manager_unittest.cc6
17 files changed, 44 insertions, 27 deletions
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 48b7bfa..45cab46 100644
--- a/chrome/browser/chromeos/kiosk_mode/kiosk_mode_idle_logout.cc
+++ b/chrome/browser/chromeos/kiosk_mode/kiosk_mode_idle_logout.cc
@@ -70,7 +70,7 @@ void KioskModeIdleLogout::Observe(
}
}
-void KioskModeIdleLogout::OnUserActivity() {
+void KioskModeIdleLogout::OnUserActivity(const ui::Event* event) {
IdleLogoutDialogView::CloseDialog();
ResetTimer();
}
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 51d0792..c358277 100644
--- a/chrome/browser/chromeos/kiosk_mode/kiosk_mode_idle_logout.h
+++ b/chrome/browser/chromeos/kiosk_mode/kiosk_mode_idle_logout.h
@@ -33,8 +33,8 @@ class KioskModeIdleLogout : public ash::UserActivityObserver,
const content::NotificationSource& source,
const content::NotificationDetails& details) OVERRIDE;
- // UserActivityObserver::Observer overrides:
- virtual void OnUserActivity() OVERRIDE;
+ // UserActivityObserver overrides:
+ virtual void OnUserActivity(const ui::Event* event) OVERRIDE;
// Begins listening for user activity and calls ResetTimer().
void Start();
diff --git a/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.cc b/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.cc
index 313e5dd..67e87f5 100644
--- a/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.cc
+++ b/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.cc
@@ -232,7 +232,7 @@ void KioskModeScreensaver::SetupScreensaver(
}
}
-void KioskModeScreensaver::OnUserActivity() {
+void KioskModeScreensaver::OnUserActivity(const ui::Event* event) {
// We don't want to handle further user notifications; we'll either login
// the user and close out or or at least close the screensaver.
ash::Shell::GetInstance()->user_activity_detector()->RemoveObserver(this);
diff --git a/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.h b/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.h
index c964017..689e25e5 100644
--- a/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.h
+++ b/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.h
@@ -24,8 +24,8 @@ class KioskModeScreensaver : public ash::UserActivityObserver {
private:
friend class KioskModeScreensaverTest;
- // UserActivityObserver::Observer overrides:
- virtual void OnUserActivity() OVERRIDE;
+ // UserActivityObserver overrides:
+ virtual void OnUserActivity(const ui::Event* event) OVERRIDE;
// Initialization functions, in order
// Get the screensaver path once KioskModeHelper is initialized.
diff --git a/chrome/browser/chromeos/login/webui_login_display.cc b/chrome/browser/chromeos/login/webui_login_display.cc
index fc4a569..48bcbc4 100644
--- a/chrome/browser/chromeos/login/webui_login_display.cc
+++ b/chrome/browser/chromeos/login/webui_login_display.cc
@@ -364,7 +364,7 @@ void WebUILoginDisplay::Signout() {
delegate_->Signout();
}
-void WebUILoginDisplay::OnUserActivity() {
+void WebUILoginDisplay::OnUserActivity(const ui::Event* event) {
if (!password_clear_timer_.IsRunning())
StartPasswordClearTimer();
password_clear_timer_.Reset();
diff --git a/chrome/browser/chromeos/login/webui_login_display.h b/chrome/browser/chromeos/login/webui_login_display.h
index de2f8cd..f8a0341 100644
--- a/chrome/browser/chromeos/login/webui_login_display.h
+++ b/chrome/browser/chromeos/login/webui_login_display.h
@@ -86,7 +86,7 @@ class WebUILoginDisplay : public LoginDisplay,
virtual void Signout() OVERRIDE;
// UserActivityDetector implementation:
- virtual void OnUserActivity() OVERRIDE;
+ virtual void OnUserActivity(const ui::Event* event) OVERRIDE;
private:
void StartPasswordClearTimer();
diff --git a/chrome/browser/chromeos/policy/recommendation_restorer.cc b/chrome/browser/chromeos/policy/recommendation_restorer.cc
index cbf8cdf..aaf19e0 100644
--- a/chrome/browser/chromeos/policy/recommendation_restorer.cc
+++ b/chrome/browser/chromeos/policy/recommendation_restorer.cc
@@ -79,7 +79,7 @@ void RecommendationRestorer::Observe(
}
}
-void RecommendationRestorer::OnUserActivity() {
+void RecommendationRestorer::OnUserActivity(const ui::Event* event) {
if (restore_timer_.IsRunning())
restore_timer_.Reset();
}
diff --git a/chrome/browser/chromeos/policy/recommendation_restorer.h b/chrome/browser/chromeos/policy/recommendation_restorer.h
index 1d67159..0f192de 100644
--- a/chrome/browser/chromeos/policy/recommendation_restorer.h
+++ b/chrome/browser/chromeos/policy/recommendation_restorer.h
@@ -41,8 +41,8 @@ class RecommendationRestorer : public BrowserContextKeyedService,
const content::NotificationSource& source,
const content::NotificationDetails& details) OVERRIDE;
- // ash::UserActivityObserver::Observer:
- virtual void OnUserActivity() OVERRIDE;
+ // ash::UserActivityObserver:
+ virtual void OnUserActivity(const ui::Event* event) OVERRIDE;
// If a recommended value and a user setting exist for |pref_name|, clears the
// user setting so that the recommended value can take effect. If
diff --git a/chrome/browser/chromeos/policy/recommendation_restorer_unittest.cc b/chrome/browser/chromeos/policy/recommendation_restorer_unittest.cc
index c6e40fd..664681e 100644
--- a/chrome/browser/chromeos/policy/recommendation_restorer_unittest.cc
+++ b/chrome/browser/chromeos/policy/recommendation_restorer_unittest.cc
@@ -151,7 +151,7 @@ void RecommendationRestorerTest::NotifyOfSessionStart() {
void RecommendationRestorerTest::NotifyOfUserActivity() {
ASSERT_TRUE(restorer_);
- restorer_->OnUserActivity();
+ restorer_->OnUserActivity(NULL);
}
void RecommendationRestorerTest::VerifyPrefFollowsUser(
diff --git a/chrome/browser/chromeos/power/user_activity_notifier.cc b/chrome/browser/chromeos/power/user_activity_notifier.cc
index 2273963..48fa344 100644
--- a/chrome/browser/chromeos/power/user_activity_notifier.cc
+++ b/chrome/browser/chromeos/power/user_activity_notifier.cc
@@ -8,6 +8,9 @@
#include "ash/wm/user_activity_detector.h"
#include "chromeos/dbus/dbus_thread_manager.h"
#include "chromeos/dbus/power_manager_client.h"
+#include "ui/base/events/event.h"
+#include "ui/base/events/event_constants.h"
+#include "ui/base/keycodes/keyboard_codes_posix.h"
namespace {
@@ -26,13 +29,27 @@ UserActivityNotifier::~UserActivityNotifier() {
ash::Shell::GetInstance()->user_activity_detector()->RemoveObserver(this);
}
-void UserActivityNotifier::OnUserActivity() {
+void UserActivityNotifier::OnUserActivity(const ui::Event* event) {
base::TimeTicks now = base::TimeTicks::Now();
// InSeconds() truncates rather than rounding, so it's fine for this
// comparison.
if (last_notify_time_.is_null() ||
(now - last_notify_time_).InSeconds() >= kNotifyIntervalSec) {
- DBusThreadManager::Get()->GetPowerManagerClient()->NotifyUserActivity();
+ power_manager::UserActivityType type = power_manager::USER_ACTIVITY_OTHER;
+ if (event && event->type() == ui::ET_KEY_PRESSED) {
+ switch (static_cast<const ui::KeyEvent*>(event)->key_code()) {
+ case ui::VKEY_BRIGHTNESS_UP:
+ type = power_manager::USER_ACTIVITY_BRIGHTNESS_UP_KEY_PRESS;
+ break;
+ case ui::VKEY_BRIGHTNESS_DOWN:
+ type = power_manager::USER_ACTIVITY_BRIGHTNESS_DOWN_KEY_PRESS;
+ break;
+ default:
+ break;
+ }
+ }
+
+ DBusThreadManager::Get()->GetPowerManagerClient()->NotifyUserActivity(type);
last_notify_time_ = now;
}
}
diff --git a/chrome/browser/chromeos/power/user_activity_notifier.h b/chrome/browser/chromeos/power/user_activity_notifier.h
index f1189ef..e44a42b 100644
--- a/chrome/browser/chromeos/power/user_activity_notifier.h
+++ b/chrome/browser/chromeos/power/user_activity_notifier.h
@@ -19,7 +19,7 @@ class UserActivityNotifier : public ash::UserActivityObserver {
virtual ~UserActivityNotifier();
// ash::UserActivityObserver implementation.
- virtual void OnUserActivity() OVERRIDE;
+ virtual void OnUserActivity(const ui::Event* event) OVERRIDE;
private:
// Last time that the power manager was notified.
diff --git a/chrome/browser/chromeos/screensaver/screensaver_controller.cc b/chrome/browser/chromeos/screensaver/screensaver_controller.cc
index 18952a8..55e6199 100644
--- a/chrome/browser/chromeos/screensaver/screensaver_controller.cc
+++ b/chrome/browser/chromeos/screensaver/screensaver_controller.cc
@@ -142,7 +142,7 @@ void ScreensaverController::IdleNotify(int64 threshold) {
ash::Shell::GetInstance()->user_activity_detector()->AddObserver(this);
}
-void ScreensaverController::OnUserActivity() {
+void ScreensaverController::OnUserActivity(const ui::Event* event) {
// We don't want to handle further user notifications; we'll either login
// the user and close out or or at least close the screensaver.
if (ash::Shell::GetInstance()->user_activity_detector()->HasObserver(this))
diff --git a/chrome/browser/chromeos/screensaver/screensaver_controller.h b/chrome/browser/chromeos/screensaver/screensaver_controller.h
index 1223415..aa69b29 100644
--- a/chrome/browser/chromeos/screensaver/screensaver_controller.h
+++ b/chrome/browser/chromeos/screensaver/screensaver_controller.h
@@ -48,8 +48,8 @@ class ScreensaverController : public ash::UserActivityObserver,
// Overridden from PowerManagerClient::Observer:
virtual void IdleNotify(int64 threshold) OVERRIDE;
- // UserActivityObserver::Observer overrides:
- virtual void OnUserActivity() OVERRIDE;
+ // UserActivityObserver overrides:
+ virtual void OnUserActivity(const ui::Event* event) OVERRIDE;
void SetupScreensaver(const std::string& screensaver_extension_id);
void TeardownScreensaver();
diff --git a/chrome/browser/chromeos/screensaver/screensaver_controller_browsertest.cc b/chrome/browser/chromeos/screensaver/screensaver_controller_browsertest.cc
index 17baf41..781c9a1 100644
--- a/chrome/browser/chromeos/screensaver/screensaver_controller_browsertest.cc
+++ b/chrome/browser/chromeos/screensaver/screensaver_controller_browsertest.cc
@@ -63,7 +63,7 @@ IN_PROC_BROWSER_TEST_F(ScreensaverControllerTest, Basic) {
EXPECT_TRUE(ash::IsScreensaverShown());
// Trigger active.
- controller_->OnUserActivity();
+ controller_->OnUserActivity(NULL);
EXPECT_FALSE(ash::IsScreensaverShown());
};
@@ -77,7 +77,7 @@ IN_PROC_BROWSER_TEST_F(ScreensaverControllerTest, OutOfOrder) {
base::MessageLoop::current()->RunUntilIdle();
// Trigger active.
- controller_->OnUserActivity();
+ controller_->OnUserActivity(NULL);
EXPECT_FALSE(ash::IsScreensaverShown());
// Trigger idle.
@@ -90,7 +90,7 @@ IN_PROC_BROWSER_TEST_F(ScreensaverControllerTest, OutOfOrder) {
EXPECT_TRUE(ash::IsScreensaverShown());
// Trigger active.
- controller_->OnUserActivity();
+ controller_->OnUserActivity(NULL);
EXPECT_FALSE(ash::IsScreensaverShown());
};
diff --git a/chrome/browser/chromeos/system/automatic_reboot_manager.cc b/chrome/browser/chromeos/system/automatic_reboot_manager.cc
index c16abdb..5ac91e7 100644
--- a/chrome/browser/chromeos/system/automatic_reboot_manager.cc
+++ b/chrome/browser/chromeos/system/automatic_reboot_manager.cc
@@ -178,7 +178,7 @@ AutomaticRebootManager::AutomaticRebootManager(
content::NotificationService::AllSources());
login_screen_idle_timer_.reset(
new base::OneShotTimer<AutomaticRebootManager>);
- OnUserActivity();
+ OnUserActivity(NULL);
}
// In a regular browser, base::ThreadTaskRunnerHandle::Get() and
@@ -240,7 +240,7 @@ void AutomaticRebootManager::UpdateStatusChanged(
Reschedule();
}
-void AutomaticRebootManager::OnUserActivity() {
+void AutomaticRebootManager::OnUserActivity(const ui::Event* event) {
if (!login_screen_idle_timer_)
return;
diff --git a/chrome/browser/chromeos/system/automatic_reboot_manager.h b/chrome/browser/chromeos/system/automatic_reboot_manager.h
index faafcd4..83e5398 100644
--- a/chrome/browser/chromeos/system/automatic_reboot_manager.h
+++ b/chrome/browser/chromeos/system/automatic_reboot_manager.h
@@ -104,7 +104,7 @@ class AutomaticRebootManager : public PowerManagerClient::Observer,
const UpdateEngineClient::Status& status) OVERRIDE;
// ash::UserActivityObserver:
- virtual void OnUserActivity() OVERRIDE;
+ virtual void OnUserActivity(const ui::Event* event) OVERRIDE;
// content::NotificationObserver:
virtual void Observe(int type,
diff --git a/chrome/browser/chromeos/system/automatic_reboot_manager_unittest.cc b/chrome/browser/chromeos/system/automatic_reboot_manager_unittest.cc
index 16a49d4..31fd458 100644
--- a/chrome/browser/chromeos/system/automatic_reboot_manager_unittest.cc
+++ b/chrome/browser/chromeos/system/automatic_reboot_manager_unittest.cc
@@ -644,7 +644,7 @@ TEST_F(AutomaticRebootManagerBasicTest, UserActivityResetsIdleTimer) {
FastForwardBy(base::TimeDelta::FromSeconds(50), false);
// Simulate user activity.
- automatic_reboot_manager_->OnUserActivity();
+ automatic_reboot_manager_->OnUserActivity(NULL);
}
// Fast forward the uptime by 60 seconds without simulating user activity.
@@ -1381,7 +1381,7 @@ TEST_P(AutomaticRebootManagerTest, PolicyAfterUpdateInGracePeriod) {
FastForwardBy(base::TimeDelta::FromHours(6), false);
// Simulate user activity.
- automatic_reboot_manager_->OnUserActivity();
+ automatic_reboot_manager_->OnUserActivity(NULL);
// Enable automatic reboot after an update has been applied. Verify that the
// device does not reboot immediately.
@@ -1418,7 +1418,7 @@ TEST_P(AutomaticRebootManagerTest, PolicyAfterUpdateAfterGracePeriod) {
false);
// Simulate user activity.
- automatic_reboot_manager_->OnUserActivity();
+ automatic_reboot_manager_->OnUserActivity(NULL);
// Enable automatic rebooting after an update has been applied. Verify that
// unless a non-kiosk-app session is in progress, the the device immediately
generated by cgit v1.1 at 2025-05-24 21:23:39 +0000