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

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

Issue 324463003: ChromeOS login webui refactoring : Simplify login methods. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge with ToT Created 6 years, 6 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/key.h"
13 #include "chrome/browser/chromeos/login/auth/user_context.h" 13 #include "chrome/browser/chromeos/login/auth/user_context.h"
14 #include "chrome/browser/chromeos/login/existing_user_controller.h" 14 #include "chrome/browser/chromeos/login/existing_user_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 .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 _new.h"
17 #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"
18 #include "chrome/browser/chromeos/login/managed/supervised_user_authentication.h " 18 #include "chrome/browser/chromeos/login/managed/supervised_user_authentication.h "
19 #include "chrome/browser/chromeos/login/screens/error_screen.h" 19 #include "chrome/browser/chromeos/login/screens/error_screen.h"
20 #include "chrome/browser/chromeos/login/screens/screen_observer.h" 20 #include "chrome/browser/chromeos/login/screens/screen_observer.h"
21 #include "chrome/browser/chromeos/login/signin_specifics.h"
21 #include "chrome/browser/chromeos/login/users/avatar/user_image.h" 22 #include "chrome/browser/chromeos/login/users/avatar/user_image.h"
22 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager.h" 23 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager.h"
23 #include "chrome/browser/chromeos/login/users/supervised_user_manager.h" 24 #include "chrome/browser/chromeos/login/users/supervised_user_manager.h"
24 #include "chrome/browser/chromeos/login/wizard_controller.h" 25 #include "chrome/browser/chromeos/login/wizard_controller.h"
25 #include "chrome/browser/supervised_user/supervised_user_constants.h" 26 #include "chrome/browser/supervised_user/supervised_user_constants.h"
26 #include "chrome/browser/supervised_user/supervised_user_shared_settings_service .h" 27 #include "chrome/browser/supervised_user/supervised_user_shared_settings_service .h"
27 #include "chrome/browser/supervised_user/supervised_user_shared_settings_service _factory.h" 28 #include "chrome/browser/supervised_user/supervised_user_shared_settings_service _factory.h"
28 #include "chrome/browser/supervised_user/supervised_user_sync_service.h" 29 #include "chrome/browser/supervised_user/supervised_user_sync_service.h"
29 #include "chrome/browser/supervised_user/supervised_user_sync_service_factory.h" 30 #include "chrome/browser/supervised_user/supervised_user_sync_service_factory.h"
30 #include "chromeos/network/network_state.h" 31 #include "chromeos/network/network_state.h"
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
199 200
200 if (authentication->GetStableSchema() == 201 if (authentication->GetStableSchema() ==
201 SupervisedUserAuthentication::SCHEMA_PLAIN) { 202 SupervisedUserAuthentication::SCHEMA_PLAIN) {
202 controller_.reset(new ManagedUserCreationControllerOld(this, manager_id)); 203 controller_.reset(new ManagedUserCreationControllerOld(this, manager_id));
203 } else { 204 } else {
204 controller_.reset(new ManagedUserCreationControllerNew(this, manager_id)); 205 controller_.reset(new ManagedUserCreationControllerNew(this, manager_id));
205 } 206 }
206 207
207 UserContext user_context(manager_id); 208 UserContext user_context(manager_id);
208 user_context.SetKey(Key(manager_password)); 209 user_context.SetKey(Key(manager_password));
209 ExistingUserController::current_controller()->Login(user_context); 210 ExistingUserController::current_controller()->Login(user_context,
211 SigninSpecifics());
210 } 212 }
211 213
212 void LocallyManagedUserCreationScreen::CreateManagedUser( 214 void LocallyManagedUserCreationScreen::CreateManagedUser(
213 const base::string16& display_name, 215 const base::string16& display_name,
214 const std::string& managed_user_password) { 216 const std::string& managed_user_password) {
215 DCHECK(controller_.get()); 217 DCHECK(controller_.get());
216 int image; 218 int image;
217 if (selected_image_ == User::kExternalImageIndex) 219 if (selected_image_ == User::kExternalImageIndex)
218 // TODO(dzhioev): crbug/249660 220 // TODO(dzhioev): crbug/249660
219 image = ManagedUserCreationController::kDummyAvatarIndex; 221 image = ManagedUserCreationController::kDummyAvatarIndex;
(...skipping 373 matching lines...) Expand 10 before | Expand all | Expand 10 after
593 selected_image_ = User::kExternalImageIndex; 595 selected_image_ = User::kExternalImageIndex;
594 } else { 596 } else {
595 NOTREACHED() << "Unexpected image type: " << image_type; 597 NOTREACHED() << "Unexpected image type: " << image_type;
596 } 598 }
597 } 599 }
598 600
599 void LocallyManagedUserCreationScreen::OnImageAccepted() { 601 void LocallyManagedUserCreationScreen::OnImageAccepted() {
600 } 602 }
601 603
602 } // namespace chromeos 604 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/login_manager_test.cc ('k') | chrome/browser/chromeos/login/signin/oauth2_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698