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

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

Issue 2832053003: cros: WallpaperController reparent based on session state (Closed)
Patch Set: rebase Created 3 years, 8 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/shell.h" 9 #include "ash/shell.h"
10 #include "ash/wallpaper/wallpaper_controller.h"
11 #include "base/memory/ptr_util.h" 10 #include "base/memory/ptr_util.h"
12 #include "base/rand_util.h" 11 #include "base/rand_util.h"
13 #include "base/values.h" 12 #include "base/values.h"
14 #include "chrome/browser/chromeos/camera_detector.h" 13 #include "chrome/browser/chromeos/camera_detector.h"
15 #include "chrome/browser/chromeos/login/error_screens_histogram_helper.h" 14 #include "chrome/browser/chromeos/login/error_screens_histogram_helper.h"
16 #include "chrome/browser/chromeos/login/existing_user_controller.h" 15 #include "chrome/browser/chromeos/login/existing_user_controller.h"
17 #include "chrome/browser/chromeos/login/screen_manager.h" 16 #include "chrome/browser/chromeos/login/screen_manager.h"
18 #include "chrome/browser/chromeos/login/screens/base_screen_delegate.h" 17 #include "chrome/browser/chromeos/login/screens/base_screen_delegate.h"
19 #include "chrome/browser/chromeos/login/screens/error_screen.h" 18 #include "chrome/browser/chromeos/login/screens/error_screen.h"
20 #include "chrome/browser/chromeos/login/screens/network_error.h" 19 #include "chrome/browser/chromeos/login/screens/network_error.h"
(...skipping 335 matching lines...) Expand 10 before | Expand all | Expand 10 after
356 view_->ShowManagerPasswordError(); 355 view_->ShowManagerPasswordError();
357 } 356 }
358 357
359 void SupervisedUserCreationScreen::OnManagerFullyAuthenticated( 358 void SupervisedUserCreationScreen::OnManagerFullyAuthenticated(
360 Profile* manager_profile) { 359 Profile* manager_profile) {
361 DBusThreadManager::Get() 360 DBusThreadManager::Get()
362 ->GetSessionManagerClient() 361 ->GetSessionManagerClient()
363 ->NotifySupervisedUserCreationStarted(); 362 ->NotifySupervisedUserCreationStarted();
364 manager_signin_in_progress_ = false; 363 manager_signin_in_progress_ = false;
365 DCHECK(controller_.get()); 364 DCHECK(controller_.get());
366 // For manager user, move wallpaper to locked container so that windows
367 // created during the user image picker step are below it.
368 ash::Shell::Get()->wallpaper_controller()->MoveToLockedContainer();
xiyuan 2017/04/21 15:30:58 Not necessary since this happens on the login scre
James Cook 2017/04/21 17:30:55 Thanks for cleaning this up!
369 365
370 controller_->SetManagerProfile(manager_profile); 366 controller_->SetManagerProfile(manager_profile);
371 if (view_) 367 if (view_)
372 view_->ShowUsernamePage(); 368 view_->ShowUsernamePage();
373 369
374 last_page_ = kNameOfNewUserParametersScreen; 370 last_page_ = kNameOfNewUserParametersScreen;
375 CHECK(!sync_service_); 371 CHECK(!sync_service_);
376 sync_service_ = SupervisedUserSyncServiceFactory::GetForProfile( 372 sync_service_ = SupervisedUserSyncServiceFactory::GetForProfile(
377 manager_profile); 373 manager_profile);
378 sync_service_->AddObserver(this); 374 sync_service_->AddObserver(this);
(...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after
623 selected_image_ = user_manager::User::USER_IMAGE_EXTERNAL; 619 selected_image_ = user_manager::User::USER_IMAGE_EXTERNAL;
624 } else { 620 } else {
625 NOTREACHED() << "Unexpected image type: " << image_type; 621 NOTREACHED() << "Unexpected image type: " << image_type;
626 } 622 }
627 } 623 }
628 624
629 void SupervisedUserCreationScreen::OnImageAccepted() { 625 void SupervisedUserCreationScreen::OnImageAccepted() {
630 } 626 }
631 627
632 } // namespace chromeos 628 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698