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

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

Issue 2738133003: Promotes a handful of members from WmShell to Shell (Closed)
Patch Set: merge Created 3 years, 9 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
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 <utility> 7 #include <utility>
8 8
9 #include "ash/common/wallpaper/wallpaper_controller.h" 9 #include "ash/common/wallpaper/wallpaper_controller.h"
10 #include "ash/common/wm_shell.h" 10 #include "ash/shell.h"
11 #include "base/memory/ptr_util.h" 11 #include "base/memory/ptr_util.h"
12 #include "base/rand_util.h" 12 #include "base/rand_util.h"
13 #include "base/values.h" 13 #include "base/values.h"
14 #include "chrome/browser/chromeos/camera_detector.h" 14 #include "chrome/browser/chromeos/camera_detector.h"
15 #include "chrome/browser/chromeos/login/error_screens_histogram_helper.h" 15 #include "chrome/browser/chromeos/login/error_screens_histogram_helper.h"
16 #include "chrome/browser/chromeos/login/existing_user_controller.h" 16 #include "chrome/browser/chromeos/login/existing_user_controller.h"
17 #include "chrome/browser/chromeos/login/screen_manager.h" 17 #include "chrome/browser/chromeos/login/screen_manager.h"
18 #include "chrome/browser/chromeos/login/screens/base_screen_delegate.h" 18 #include "chrome/browser/chromeos/login/screens/base_screen_delegate.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/network_error.h" 20 #include "chrome/browser/chromeos/login/screens/network_error.h"
(...skipping 337 matching lines...) Expand 10 before | Expand all | Expand 10 after
358 358
359 void SupervisedUserCreationScreen::OnManagerFullyAuthenticated( 359 void SupervisedUserCreationScreen::OnManagerFullyAuthenticated(
360 Profile* manager_profile) { 360 Profile* manager_profile) {
361 DBusThreadManager::Get() 361 DBusThreadManager::Get()
362 ->GetSessionManagerClient() 362 ->GetSessionManagerClient()
363 ->NotifySupervisedUserCreationStarted(); 363 ->NotifySupervisedUserCreationStarted();
364 manager_signin_in_progress_ = false; 364 manager_signin_in_progress_ = false;
365 DCHECK(controller_.get()); 365 DCHECK(controller_.get());
366 // For manager user, move wallpaper to locked container so that windows 366 // For manager user, move wallpaper to locked container so that windows
367 // created during the user image picker step are below it. 367 // created during the user image picker step are below it.
368 ash::WmShell::Get()->wallpaper_controller()->MoveToLockedContainer(); 368 ash::Shell::GetInstance()->wallpaper_controller()->MoveToLockedContainer();
369 369
370 controller_->SetManagerProfile(manager_profile); 370 controller_->SetManagerProfile(manager_profile);
371 if (view_) 371 if (view_)
372 view_->ShowUsernamePage(); 372 view_->ShowUsernamePage();
373 373
374 last_page_ = kNameOfNewUserParametersScreen; 374 last_page_ = kNameOfNewUserParametersScreen;
375 CHECK(!sync_service_); 375 CHECK(!sync_service_);
376 sync_service_ = SupervisedUserSyncServiceFactory::GetForProfile( 376 sync_service_ = SupervisedUserSyncServiceFactory::GetForProfile(
377 manager_profile); 377 manager_profile);
378 sync_service_->AddObserver(this); 378 sync_service_->AddObserver(this);
(...skipping 243 matching lines...) Expand 10 before | Expand all | Expand 10 after
622 selected_image_ = user_manager::User::USER_IMAGE_EXTERNAL; 622 selected_image_ = user_manager::User::USER_IMAGE_EXTERNAL;
623 } else { 623 } else {
624 NOTREACHED() << "Unexpected image type: " << image_type; 624 NOTREACHED() << "Unexpected image type: " << image_type;
625 } 625 }
626 } 626 }
627 627
628 void SupervisedUserCreationScreen::OnImageAccepted() { 628 void SupervisedUserCreationScreen::OnImageAccepted() {
629 } 629 }
630 630
631 } // namespace chromeos 631 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/lock/screen_locker.cc ('k') | chrome/browser/chromeos/login/ui/login_display_host_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698