OLD | NEW |
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/common/shelf/wm_shelf.h" | 7 #include "ash/common/shelf/wm_shelf.h" |
| 8 #include "ash/common/wallpaper/wallpaper_controller.h" |
8 #include "ash/common/wm_shell.h" | 9 #include "ash/common/wm_shell.h" |
9 #include "ash/shell.h" | |
10 #include "ash/wallpaper/wallpaper_controller.h" | |
11 #include "base/rand_util.h" | 10 #include "base/rand_util.h" |
12 #include "base/values.h" | 11 #include "base/values.h" |
13 #include "chrome/browser/chromeos/camera_detector.h" | 12 #include "chrome/browser/chromeos/camera_detector.h" |
14 #include "chrome/browser/chromeos/login/error_screens_histogram_helper.h" | 13 #include "chrome/browser/chromeos/login/error_screens_histogram_helper.h" |
15 #include "chrome/browser/chromeos/login/existing_user_controller.h" | 14 #include "chrome/browser/chromeos/login/existing_user_controller.h" |
16 #include "chrome/browser/chromeos/login/screen_manager.h" | 15 #include "chrome/browser/chromeos/login/screen_manager.h" |
17 #include "chrome/browser/chromeos/login/screens/base_screen_delegate.h" | 16 #include "chrome/browser/chromeos/login/screens/base_screen_delegate.h" |
18 #include "chrome/browser/chromeos/login/screens/error_screen.h" | 17 #include "chrome/browser/chromeos/login/screens/error_screen.h" |
19 #include "chrome/browser/chromeos/login/screens/network_error.h" | 18 #include "chrome/browser/chromeos/login/screens/network_error.h" |
20 #include "chrome/browser/chromeos/login/signin_specifics.h" | 19 #include "chrome/browser/chromeos/login/signin_specifics.h" |
(...skipping 346 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
367 | 366 |
368 void SupervisedUserCreationScreen::OnManagerFullyAuthenticated( | 367 void SupervisedUserCreationScreen::OnManagerFullyAuthenticated( |
369 Profile* manager_profile) { | 368 Profile* manager_profile) { |
370 DBusThreadManager::Get() | 369 DBusThreadManager::Get() |
371 ->GetSessionManagerClient() | 370 ->GetSessionManagerClient() |
372 ->NotifySupervisedUserCreationStarted(); | 371 ->NotifySupervisedUserCreationStarted(); |
373 manager_signin_in_progress_ = false; | 372 manager_signin_in_progress_ = false; |
374 DCHECK(controller_.get()); | 373 DCHECK(controller_.get()); |
375 // For manager user, move wallpaper to locked container so that windows | 374 // For manager user, move wallpaper to locked container so that windows |
376 // created during the user image picker step are below it. | 375 // created during the user image picker step are below it. |
377 ash::Shell::GetInstance()->wallpaper_controller()->MoveToLockedContainer(); | 376 ash::WmShell::Get()->wallpaper_controller()->MoveToLockedContainer(); |
378 ash::WmShelf::ForWindow(ash::WmShell::Get()->GetPrimaryRootWindow()) | 377 ash::WmShelf::ForWindow(ash::WmShell::Get()->GetPrimaryRootWindow()) |
379 ->SetAlignment(ash::ShelfAlignment::SHELF_ALIGNMENT_BOTTOM_LOCKED); | 378 ->SetAlignment(ash::ShelfAlignment::SHELF_ALIGNMENT_BOTTOM_LOCKED); |
380 | 379 |
381 controller_->SetManagerProfile(manager_profile); | 380 controller_->SetManagerProfile(manager_profile); |
382 if (actor_) | 381 if (actor_) |
383 actor_->ShowUsernamePage(); | 382 actor_->ShowUsernamePage(); |
384 | 383 |
385 last_page_ = kNameOfNewUserParametersScreen; | 384 last_page_ = kNameOfNewUserParametersScreen; |
386 CHECK(!sync_service_); | 385 CHECK(!sync_service_); |
387 sync_service_ = SupervisedUserSyncServiceFactory::GetForProfile( | 386 sync_service_ = SupervisedUserSyncServiceFactory::GetForProfile( |
(...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
628 selected_image_ = user_manager::User::USER_IMAGE_EXTERNAL; | 627 selected_image_ = user_manager::User::USER_IMAGE_EXTERNAL; |
629 } else { | 628 } else { |
630 NOTREACHED() << "Unexpected image type: " << image_type; | 629 NOTREACHED() << "Unexpected image type: " << image_type; |
631 } | 630 } |
632 } | 631 } |
633 | 632 |
634 void SupervisedUserCreationScreen::OnImageAccepted() { | 633 void SupervisedUserCreationScreen::OnImageAccepted() { |
635 } | 634 } |
636 | 635 |
637 } // namespace chromeos | 636 } // namespace chromeos |
OLD | NEW |