Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(145)

Issue 10693087: chromeos: Request screen lock directly from session manager. (Closed)

Created:
8 years, 5 months ago by Daniel Erat
Modified:
8 years, 5 months ago
Reviewers:
flackr, oshima
CC:
chromium-reviews, sadrul, nkostylev+watch_chromium.org, ben+watch_chromium.org, kkania, robertshield, oshima+watch_chromium.org, stevenjb+watch_chromium.org, davemoore+watch_chromium.org
Visibility:
Public.

Description

chromeos: Request screen lock directly from session manager. Screen lock and unlock requests were previously sent to powerd, which just forwarded them on to the session manager without doing anything extra. It's simpler for Chrome to just ask the session manager to lock or unlock directly. I'm also moving the LockScreen and UnlockScreen notifications from PowerManagerClient::Observer to SessionManagerClient::Observer. Confusingly, the signals that prompt those notifications are sent by the session manager but were being listened for in PowerManagerClient. BUG=chromium-os:24003 TEST=manual: able to lock the screen from the UI, power button, and by closing the lid; unlocking works too Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=145737

Patch Set 1 #

Patch Set 2 : diff against 10703081 #

Patch Set 3 : update #

Total comments: 6

Patch Set 4 : merge #

Patch Set 5 : update MockSessionManagerClient #

Patch Set 6 : really fix MockSessionManagerClient #

Patch Set 7 : remove locking-related metrics code #

Unified diffs Side-by-side diffs Delta from patch set Stats (+130 lines, -255 lines) Patch
M chrome/browser/automation/testing_automation_provider_chromeos.cc View 2 chunks +2 lines, -2 lines 0 comments Download
M chrome/browser/chromeos/login/login_performer.cc View 2 chunks +3 lines, -5 lines 0 comments Download
M chrome/browser/chromeos/login/screen_locker.cc View 1 4 chunks +6 lines, -10 lines 0 comments Download
M chrome/browser/chromeos/notifications/system_notification.h View 3 chunks +3 lines, -3 lines 0 comments Download
M chrome/browser/chromeos/notifications/system_notification.cc View 3 chunks +4 lines, -3 lines 0 comments Download
M chrome/browser/chromeos/power/power_button_controller_delegate_chromeos.cc View 2 chunks +2 lines, -2 lines 0 comments Download
M chrome/browser/chromeos/power/power_button_observer.h View 3 chunks +5 lines, -1 line 0 comments Download
M chrome/browser/chromeos/power/power_button_observer.cc View 2 chunks +2 lines, -0 lines 0 comments Download
M chrome/browser/chromeos/power/screen_lock_observer.h View 1 chunk +3 lines, -3 lines 0 comments Download
M chrome/browser/chromeos/power/screen_lock_observer.cc View 1 chunk +2 lines, -2 lines 0 comments Download
M chrome/browser/chromeos/system/ash_system_tray_delegate.cc View 1 6 chunks +6 lines, -2 lines 0 comments Download
M chrome/browser/ui/views/ash/chrome_shell_delegate.cc View 2 chunks +3 lines, -2 lines 0 comments Download
M chromeos/dbus/mock_power_manager_client.h View 1 chunk +0 lines, -3 lines 0 comments Download
M chromeos/dbus/mock_session_manager_client.h View 1 2 3 4 5 1 chunk +4 lines, -0 lines 0 comments Download
M chromeos/dbus/power_manager_client.h View 1 2 chunks +0 lines, -17 lines 0 comments Download
M chromeos/dbus/power_manager_client.cc View 1 2 10 chunks +1 line, -144 lines 0 comments Download
M chromeos/dbus/session_manager_client.h View 2 chunks +20 lines, -0 lines 0 comments Download
M chromeos/dbus/session_manager_client.cc View 1 2 3 4 5 6 12 chunks +64 lines, -56 lines 0 comments Download

Messages

Total messages: 8 (0 generated)
Daniel Erat
This can't go in until https://chromiumcodereview.appspot.com/10703081/ and https://gerrit.chromium.org/gerrit/#change,26707 are in. http://codereview.chromium.org/10693087/diff/4001/chromeos/dbus/session_manager_client.cc File chromeos/dbus/session_manager_client.cc (right): http://codereview.chromium.org/10693087/diff/4001/chromeos/dbus/session_manager_client.cc#newcode22 ...
8 years, 5 months ago (2012-07-03 22:44:27 UTC) #1
flackr
Can you also check that idle timeout still locks the screen? http://codereview.chromium.org/10693087/diff/4001/chromeos/dbus/session_manager_client.cc File chromeos/dbus/session_manager_client.cc (right): ...
8 years, 5 months ago (2012-07-04 12:55:52 UTC) #2
oshima
lgtm with one question http://codereview.chromium.org/10693087/diff/4001/chromeos/dbus/session_manager_client.h File chromeos/dbus/session_manager_client.h (right): http://codereview.chromium.org/10693087/diff/4001/chromeos/dbus/session_manager_client.h#newcode66 chromeos/dbus/session_manager_client.h:66: virtual void RequestLockScreen() = 0; ...
8 years, 5 months ago (2012-07-06 17:31:12 UTC) #3
Daniel Erat
I've confirmed that idle timeout still locks the screen. (But I believe that this is ...
8 years, 5 months ago (2012-07-09 16:01:42 UTC) #4
flackr
LGTM https://chromiumcodereview.appspot.com/10693087/diff/4001/chromeos/dbus/session_manager_client.cc File chromeos/dbus/session_manager_client.cc (right): https://chromiumcodereview.appspot.com/10693087/diff/4001/chromeos/dbus/session_manager_client.cc#newcode22 chromeos/dbus/session_manager_client.cc:22: enum LockScreensState { On 2012/07/09 16:01:42, Daniel Erat ...
8 years, 5 months ago (2012-07-09 18:19:57 UTC) #5
Daniel Erat
Thanks, I've removed the metrics code.
8 years, 5 months ago (2012-07-09 18:46:40 UTC) #6
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/derat@chromium.org/10693087/18001
8 years, 5 months ago (2012-07-09 19:17:08 UTC) #7
commit-bot: I haz the power
8 years, 5 months ago (2012-07-09 20:32:20 UTC) #8
Change committed as 145737

Powered by Google App Engine
This is Rietveld 408576698