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

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

Issue 10832035: Switch from SignedSettings to DeviceSettingsService. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase, simplify migration. 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 202 matching lines...) Expand 10 before | Expand all | Expand 10 after
213 213
214 void ScreenLocker::Authenticate(const string16& password) { 214 void ScreenLocker::Authenticate(const string16& password) {
215 authentication_start_time_ = base::Time::Now(); 215 authentication_start_time_ = base::Time::Now();
216 delegate_->SetInputEnabled(false); 216 delegate_->SetInputEnabled(false);
217 delegate_->OnAuthenticate(); 217 delegate_->OnAuthenticate();
218 218
219 // If LoginPerformer instance exists, 219 // If LoginPerformer instance exists,
220 // initial online login phase is still active. 220 // initial online login phase is still active.
221 if (LoginPerformer::default_performer()) { 221 if (LoginPerformer::default_performer()) {
222 DVLOG(1) << "Delegating authentication to LoginPerformer."; 222 DVLOG(1) << "Delegating authentication to LoginPerformer.";
223 LoginPerformer::default_performer()->Login(user_.email(), 223 LoginPerformer::default_performer()->PerformLogin(
224 UTF16ToUTF8(password)); 224 user_.email(), UTF16ToUTF8(password),
225 LoginPerformer::AUTH_MODE_INTERNAL);
225 } else { 226 } else {
226 BrowserThread::PostTask( 227 BrowserThread::PostTask(
227 BrowserThread::UI, FROM_HERE, 228 BrowserThread::UI, FROM_HERE,
228 base::Bind(&Authenticator::AuthenticateToUnlock, authenticator_.get(), 229 base::Bind(&Authenticator::AuthenticateToUnlock, authenticator_.get(),
229 user_.email(), UTF16ToUTF8(password))); 230 user_.email(), UTF16ToUTF8(password)));
230 } 231 }
231 } 232 }
232 233
233 void ScreenLocker::ClearErrors() { 234 void ScreenLocker::ClearErrors() {
234 delegate_->ClearErrors(); 235 delegate_->ClearErrors();
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
349 bool state = true; 350 bool state = true;
350 content::NotificationService::current()->Notify( 351 content::NotificationService::current()->Notify(
351 chrome::NOTIFICATION_SCREEN_LOCK_STATE_CHANGED, 352 chrome::NOTIFICATION_SCREEN_LOCK_STATE_CHANGED,
352 content::Source<ScreenLocker>(this), 353 content::Source<ScreenLocker>(this),
353 content::Details<bool>(&state)); 354 content::Details<bool>(&state));
354 DBusThreadManager::Get()->GetPowerManagerClient()-> 355 DBusThreadManager::Get()->GetPowerManagerClient()->
355 NotifyScreenLockCompleted(); 356 NotifyScreenLockCompleted();
356 } 357 }
357 358
358 } // namespace chromeos 359 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698