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

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

Issue 654173005: Don't allow restarting to apply custom flags when supervised user creation flow is active (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: logging restart due flags as warning, don't restart for supervised users Created 6 years, 2 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_flow .h" 5 #include "chrome/browser/chromeos/login/supervised/supervised_user_creation_flow .h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/values.h" 8 #include "base/values.h"
9 #include "chrome/browser/chromeos/login/supervised/supervised_user_creation_scre en.h" 9 #include "chrome/browser/chromeos/login/supervised/supervised_user_creation_scre en.h"
10 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h" 10 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 } 45 }
46 46
47 bool SupervisedUserCreationFlow::ShouldLaunchBrowser() { 47 bool SupervisedUserCreationFlow::ShouldLaunchBrowser() {
48 return false; 48 return false;
49 } 49 }
50 50
51 bool SupervisedUserCreationFlow::ShouldSkipPostLoginScreens() { 51 bool SupervisedUserCreationFlow::ShouldSkipPostLoginScreens() {
52 return true; 52 return true;
53 } 53 }
54 54
55 bool SupervisedUserCreationFlow::SupportsEarlyRestartToApplyFlags() {
56 return false;
57 }
58
55 void SupervisedUserCreationFlow::HandleOAuthTokenStatusChange( 59 void SupervisedUserCreationFlow::HandleOAuthTokenStatusChange(
56 user_manager::User::OAuthTokenStatus status) { 60 user_manager::User::OAuthTokenStatus status) {
57 if (status == user_manager::User::OAUTH_TOKEN_STATUS_UNKNOWN) 61 if (status == user_manager::User::OAUTH_TOKEN_STATUS_UNKNOWN)
58 return; 62 return;
59 if (status == user_manager::User::OAUTH2_TOKEN_STATUS_INVALID) { 63 if (status == user_manager::User::OAUTH2_TOKEN_STATUS_INVALID) {
60 GetScreen(host())->ShowManagerInconsistentStateErrorScreen(); 64 GetScreen(host())->ShowManagerInconsistentStateErrorScreen();
61 return; 65 return;
62 } 66 }
63 DCHECK(status == user_manager::User::OAUTH2_TOKEN_STATUS_VALID); 67 DCHECK(status == user_manager::User::OAUTH2_TOKEN_STATUS_VALID);
64 // We expect that LaunchExtraSteps is called by this time (local 68 // We expect that LaunchExtraSteps is called by this time (local
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 if (token_validated_ && logged_in_) { 102 if (token_validated_ && logged_in_) {
99 if (!session_started_) 103 if (!session_started_)
100 GetScreen(host())->OnManagerFullyAuthenticated(manager_profile_); 104 GetScreen(host())->OnManagerFullyAuthenticated(manager_profile_);
101 session_started_ = true; 105 session_started_ = true;
102 } else { 106 } else {
103 GetScreen(host())->OnManagerCryptohomeAuthenticated(); 107 GetScreen(host())->OnManagerCryptohomeAuthenticated();
104 } 108 }
105 } 109 }
106 110
107 } // namespace chromeos 111 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698