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

Side by Side Diff: chrome/browser/chromeos/login/screen_locker.cc

Issue 10918027: Revert 154457 - Switch from SignedSettings to DeviceSettingsService. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chromeos/login/screen_locker.h" 5 #include "chrome/browser/chromeos/login/screen_locker.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "ash/desktop_background/desktop_background_controller.h" 10 #include "ash/desktop_background/desktop_background_controller.h"
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
219 219
220 void ScreenLocker::Authenticate(const string16& password) { 220 void ScreenLocker::Authenticate(const string16& password) {
221 authentication_start_time_ = base::Time::Now(); 221 authentication_start_time_ = base::Time::Now();
222 delegate_->SetInputEnabled(false); 222 delegate_->SetInputEnabled(false);
223 delegate_->OnAuthenticate(); 223 delegate_->OnAuthenticate();
224 224
225 // If LoginPerformer instance exists, 225 // If LoginPerformer instance exists,
226 // initial online login phase is still active. 226 // initial online login phase is still active.
227 if (LoginPerformer::default_performer()) { 227 if (LoginPerformer::default_performer()) {
228 DVLOG(1) << "Delegating authentication to LoginPerformer."; 228 DVLOG(1) << "Delegating authentication to LoginPerformer.";
229 LoginPerformer::default_performer()->PerformLogin( 229 LoginPerformer::default_performer()->Login(user_.email(),
230 user_.email(), UTF16ToUTF8(password), 230 UTF16ToUTF8(password));
231 LoginPerformer::AUTH_MODE_INTERNAL);
232 } else { 231 } else {
233 BrowserThread::PostTask( 232 BrowserThread::PostTask(
234 BrowserThread::UI, FROM_HERE, 233 BrowserThread::UI, FROM_HERE,
235 base::Bind(&Authenticator::AuthenticateToUnlock, authenticator_.get(), 234 base::Bind(&Authenticator::AuthenticateToUnlock, authenticator_.get(),
236 user_.email(), UTF16ToUTF8(password))); 235 user_.email(), UTF16ToUTF8(password)));
237 } 236 }
238 } 237 }
239 238
240 void ScreenLocker::ClearErrors() { 239 void ScreenLocker::ClearErrors() {
241 delegate_->ClearErrors(); 240 delegate_->ClearErrors();
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
356 bool state = true; 355 bool state = true;
357 content::NotificationService::current()->Notify( 356 content::NotificationService::current()->Notify(
358 chrome::NOTIFICATION_SCREEN_LOCK_STATE_CHANGED, 357 chrome::NOTIFICATION_SCREEN_LOCK_STATE_CHANGED,
359 content::Source<ScreenLocker>(this), 358 content::Source<ScreenLocker>(this),
360 content::Details<bool>(&state)); 359 content::Details<bool>(&state));
361 DBusThreadManager::Get()->GetPowerManagerClient()-> 360 DBusThreadManager::Get()->GetPowerManagerClient()->
362 NotifyScreenLockCompleted(); 361 NotifyScreenLockCompleted();
363 } 362 }
364 363
365 } // namespace chromeos 364 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/parallel_authenticator_unittest.cc ('k') | chrome/browser/chromeos/login/user_manager_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698