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

Side by Side Diff: chrome/browser/chromeos/login/managed/locally_managed_user_creation_screen.cc

Issue 296773002: Add a Key class (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased. Created 6 years, 7 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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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/managed/locally_managed_user_creation_sc reen.h" 5 #include "chrome/browser/chromeos/login/managed/locally_managed_user_creation_sc reen.h"
6 6
7 #include "ash/desktop_background/desktop_background_controller.h" 7 #include "ash/desktop_background/desktop_background_controller.h"
8 #include "ash/shell.h" 8 #include "ash/shell.h"
9 #include "base/rand_util.h" 9 #include "base/rand_util.h"
10 #include "base/values.h" 10 #include "base/values.h"
11 #include "chrome/browser/chromeos/camera_detector.h" 11 #include "chrome/browser/chromeos/camera_detector.h"
12 #include "chrome/browser/chromeos/login/auth/key.h"
12 #include "chrome/browser/chromeos/login/auth/user_context.h" 13 #include "chrome/browser/chromeos/login/auth/user_context.h"
13 #include "chrome/browser/chromeos/login/existing_user_controller.h" 14 #include "chrome/browser/chromeos/login/existing_user_controller.h"
14 #include "chrome/browser/chromeos/login/managed/managed_user_creation_controller .h" 15 #include "chrome/browser/chromeos/login/managed/managed_user_creation_controller .h"
15 #include "chrome/browser/chromeos/login/managed/managed_user_creation_controller _new.h" 16 #include "chrome/browser/chromeos/login/managed/managed_user_creation_controller _new.h"
16 #include "chrome/browser/chromeos/login/managed/managed_user_creation_controller _old.h" 17 #include "chrome/browser/chromeos/login/managed/managed_user_creation_controller _old.h"
17 #include "chrome/browser/chromeos/login/managed/supervised_user_authentication.h " 18 #include "chrome/browser/chromeos/login/managed/supervised_user_authentication.h "
18 #include "chrome/browser/chromeos/login/screens/error_screen.h" 19 #include "chrome/browser/chromeos/login/screens/error_screen.h"
19 #include "chrome/browser/chromeos/login/screens/screen_observer.h" 20 #include "chrome/browser/chromeos/login/screens/screen_observer.h"
20 #include "chrome/browser/chromeos/login/users/avatar/user_image.h" 21 #include "chrome/browser/chromeos/login/users/avatar/user_image.h"
21 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager.h" 22 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager.h"
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
197 UserManager::Get()->GetSupervisedUserManager()->GetAuthentication(); 198 UserManager::Get()->GetSupervisedUserManager()->GetAuthentication();
198 199
199 if (authentication->GetStableSchema() == 200 if (authentication->GetStableSchema() ==
200 SupervisedUserAuthentication::SCHEMA_PLAIN) { 201 SupervisedUserAuthentication::SCHEMA_PLAIN) {
201 controller_.reset(new ManagedUserCreationControllerOld(this, manager_id)); 202 controller_.reset(new ManagedUserCreationControllerOld(this, manager_id));
202 } else { 203 } else {
203 controller_.reset(new ManagedUserCreationControllerNew(this, manager_id)); 204 controller_.reset(new ManagedUserCreationControllerNew(this, manager_id));
204 } 205 }
205 206
206 UserContext user_context(manager_id); 207 UserContext user_context(manager_id);
207 user_context.SetPassword(manager_password); 208 user_context.SetKey(Key(manager_password));
208 ExistingUserController::current_controller()->Login(user_context); 209 ExistingUserController::current_controller()->Login(user_context);
209 } 210 }
210 211
211 void LocallyManagedUserCreationScreen::CreateManagedUser( 212 void LocallyManagedUserCreationScreen::CreateManagedUser(
212 const base::string16& display_name, 213 const base::string16& display_name,
213 const std::string& managed_user_password) { 214 const std::string& managed_user_password) {
214 DCHECK(controller_.get()); 215 DCHECK(controller_.get());
215 int image; 216 int image;
216 if (selected_image_ == User::kExternalImageIndex) 217 if (selected_image_ == User::kExternalImageIndex)
217 // TODO(dzhioev): crbug/249660 218 // TODO(dzhioev): crbug/249660
(...skipping 373 matching lines...) Expand 10 before | Expand all | Expand 10 after
591 selected_image_ = User::kExternalImageIndex; 592 selected_image_ = User::kExternalImageIndex;
592 } else { 593 } else {
593 NOTREACHED() << "Unexpected image type: " << image_type; 594 NOTREACHED() << "Unexpected image type: " << image_type;
594 } 595 }
595 } 596 }
596 597
597 void LocallyManagedUserCreationScreen::OnImageAccepted() { 598 void LocallyManagedUserCreationScreen::OnImageAccepted() {
598 } 599 }
599 600
600 } // namespace chromeos 601 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698