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

Side by Side Diff: chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.cc

Issue 1623603002: When adding a supervised user, ensure the shelf position is at the bottom. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@move-login-display-host
Patch Set: Created 4 years, 11 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
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/ui/webui_login_view.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/supervised/supervised_user_creation_scre en.h" 5 #include "chrome/browser/chromeos/login/supervised/supervised_user_creation_scre en.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/error_screens_histogram_helper.h" 12 #include "chrome/browser/chromeos/login/error_screens_histogram_helper.h"
13 #include "chrome/browser/chromeos/login/existing_user_controller.h" 13 #include "chrome/browser/chromeos/login/existing_user_controller.h"
14 #include "chrome/browser/chromeos/login/screen_manager.h" 14 #include "chrome/browser/chromeos/login/screen_manager.h"
15 #include "chrome/browser/chromeos/login/screens/base_screen_delegate.h" 15 #include "chrome/browser/chromeos/login/screens/base_screen_delegate.h"
16 #include "chrome/browser/chromeos/login/screens/error_screen.h" 16 #include "chrome/browser/chromeos/login/screens/error_screen.h"
17 #include "chrome/browser/chromeos/login/screens/network_error.h" 17 #include "chrome/browser/chromeos/login/screens/network_error.h"
18 #include "chrome/browser/chromeos/login/signin_specifics.h" 18 #include "chrome/browser/chromeos/login/signin_specifics.h"
19 #include "chrome/browser/chromeos/login/supervised/supervised_user_authenticatio n.h" 19 #include "chrome/browser/chromeos/login/supervised/supervised_user_authenticatio n.h"
20 #include "chrome/browser/chromeos/login/supervised/supervised_user_creation_cont roller.h" 20 #include "chrome/browser/chromeos/login/supervised/supervised_user_creation_cont roller.h"
21 #include "chrome/browser/chromeos/login/supervised/supervised_user_creation_cont roller_new.h" 21 #include "chrome/browser/chromeos/login/supervised/supervised_user_creation_cont roller_new.h"
22 #include "chrome/browser/chromeos/login/supervised/supervised_user_creation_flow .h" 22 #include "chrome/browser/chromeos/login/supervised/supervised_user_creation_flow .h"
23 #include "chrome/browser/chromeos/login/ui/login_display_host.h"
23 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager.h" 24 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager.h"
24 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h" 25 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h"
25 #include "chrome/browser/chromeos/login/users/supervised_user_manager.h" 26 #include "chrome/browser/chromeos/login/users/supervised_user_manager.h"
26 #include "chrome/browser/chromeos/login/wizard_controller.h" 27 #include "chrome/browser/chromeos/login/wizard_controller.h"
27 #include "chrome/browser/supervised_user/legacy/supervised_user_shared_settings_ service.h" 28 #include "chrome/browser/supervised_user/legacy/supervised_user_shared_settings_ service.h"
28 #include "chrome/browser/supervised_user/legacy/supervised_user_shared_settings_ service_factory.h" 29 #include "chrome/browser/supervised_user/legacy/supervised_user_shared_settings_ service_factory.h"
29 #include "chrome/browser/supervised_user/legacy/supervised_user_sync_service.h" 30 #include "chrome/browser/supervised_user/legacy/supervised_user_sync_service.h"
30 #include "chrome/browser/supervised_user/legacy/supervised_user_sync_service_fac tory.h" 31 #include "chrome/browser/supervised_user/legacy/supervised_user_sync_service_fac tory.h"
31 #include "chrome/browser/supervised_user/supervised_user_constants.h" 32 #include "chrome/browser/supervised_user/supervised_user_constants.h"
32 #include "chrome/grit/generated_resources.h" 33 #include "chrome/grit/generated_resources.h"
(...skipping 334 matching lines...) Expand 10 before | Expand all | Expand 10 after
367 DBusThreadManager::Get() 368 DBusThreadManager::Get()
368 ->GetSessionManagerClient() 369 ->GetSessionManagerClient()
369 ->NotifySupervisedUserCreationStarted(); 370 ->NotifySupervisedUserCreationStarted();
370 manager_signin_in_progress_ = false; 371 manager_signin_in_progress_ = false;
371 DCHECK(controller_.get()); 372 DCHECK(controller_.get());
372 // For manager user, move desktop to locked container so that windows created 373 // For manager user, move desktop to locked container so that windows created
373 // during the user image picker step are below it. 374 // during the user image picker step are below it.
374 ash::Shell::GetInstance()-> 375 ash::Shell::GetInstance()->
375 desktop_background_controller()->MoveDesktopToLockedContainer(); 376 desktop_background_controller()->MoveDesktopToLockedContainer();
376 377
378 // Hide the status area and the control bar, since they will show up at the
379 // logged in users's preferred location, which could be on the left or right
380 // side of the screen.
381 LoginDisplayHost* default_host = LoginDisplayHost::default_host();
382 default_host->SetStatusAreaVisible(false);
383 default_host->GetOobeUI()->GetCoreOobeActor()->ShowControlBar(false);
384
377 controller_->SetManagerProfile(manager_profile); 385 controller_->SetManagerProfile(manager_profile);
378 if (actor_) 386 if (actor_)
379 actor_->ShowUsernamePage(); 387 actor_->ShowUsernamePage();
380 388
381 last_page_ = kNameOfNewUserParametersScreen; 389 last_page_ = kNameOfNewUserParametersScreen;
382 CHECK(!sync_service_); 390 CHECK(!sync_service_);
383 sync_service_ = SupervisedUserSyncServiceFactory::GetForProfile( 391 sync_service_ = SupervisedUserSyncServiceFactory::GetForProfile(
384 manager_profile); 392 manager_profile);
385 sync_service_->AddObserver(this); 393 sync_service_->AddObserver(this);
386 OnSupervisedUsersChanged(); 394 OnSupervisedUsersChanged();
(...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after
624 selected_image_ = user_manager::User::USER_IMAGE_EXTERNAL; 632 selected_image_ = user_manager::User::USER_IMAGE_EXTERNAL;
625 } else { 633 } else {
626 NOTREACHED() << "Unexpected image type: " << image_type; 634 NOTREACHED() << "Unexpected image type: " << image_type;
627 } 635 }
628 } 636 }
629 637
630 void SupervisedUserCreationScreen::OnImageAccepted() { 638 void SupervisedUserCreationScreen::OnImageAccepted() {
631 } 639 }
632 640
633 } // namespace chromeos 641 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/ui/webui_login_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698