| Index: chrome/browser/chromeos/login/screen_locker.cc
|
| diff --git a/chrome/browser/chromeos/login/screen_locker.cc b/chrome/browser/chromeos/login/screen_locker.cc
|
| index 3915714005adf4db441a951e54e8e90d9b940fa1..89b449408b74126f36d840a3e28e770a9ae46f4b 100644
|
| --- a/chrome/browser/chromeos/login/screen_locker.cc
|
| +++ b/chrome/browser/chromeos/login/screen_locker.cc
|
| @@ -107,16 +107,9 @@ class ScreenLockObserver : public SessionManagerClient::Observer,
|
| }
|
| }
|
|
|
| - // TODO(derat): Remove this once the session manager is calling the LockScreen
|
| - // method instead of emitting a signal.
|
| - virtual void LockScreen() OVERRIDE {
|
| - VLOG(1) << "Received LockScreen D-Bus signal from session manager";
|
| - ScreenLocker::HandleLockScreenRequest();
|
| - }
|
| -
|
| virtual void OnUserAddingFinished() OVERRIDE {
|
| UserAddingScreen::Get()->RemoveObserver(this);
|
| - LockScreen();
|
| + ScreenLocker::HandleLockScreenRequest();
|
| }
|
|
|
| private:
|
|
|