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

Side by Side Diff: chrome/browser/chromeos/login/existing_user_controller.cc

Issue 2107353002: Fix the flaky test KioskTest.LaunchAppUserCancel (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: UI_STATE_UNKNOWN Created 4 years, 5 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/existing_user_controller.h" 5 #include "chrome/browser/chromeos/login/existing_user_controller.h"
6 6
7 #include <memory> 7 #include <memory>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after
255 filtered_users.push_back(user); 255 filtered_users.push_back(user);
256 } 256 }
257 } 257 }
258 258
259 // If no user pods are visible, fallback to single new user pod which will 259 // If no user pods are visible, fallback to single new user pod which will
260 // have guest session link. 260 // have guest session link.
261 bool show_guest; 261 bool show_guest;
262 cros_settings_->GetBoolean(kAccountsPrefAllowGuest, &show_guest); 262 cros_settings_->GetBoolean(kAccountsPrefAllowGuest, &show_guest);
263 show_users_on_signin |= !filtered_users.empty(); 263 show_users_on_signin |= !filtered_users.empty();
264 show_guest &= !filtered_users.empty(); 264 show_guest &= !filtered_users.empty();
265 bool show_new_user = true; 265 bool allow_new_user = true;
266 cros_settings_->GetBoolean(kAccountsPrefAllowNewUser, &allow_new_user);
266 login_display_->set_parent_window(GetNativeWindow()); 267 login_display_->set_parent_window(GetNativeWindow());
267 login_display_->Init( 268 login_display_->Init(filtered_users, show_guest, show_users_on_signin,
268 filtered_users, show_guest, show_users_on_signin, show_new_user); 269 allow_new_user);
269 host_->OnPreferencesChanged(); 270 host_->OnPreferencesChanged();
270 } 271 }
271 272
272 //////////////////////////////////////////////////////////////////////////////// 273 ////////////////////////////////////////////////////////////////////////////////
273 // ExistingUserController, content::NotificationObserver implementation: 274 // ExistingUserController, content::NotificationObserver implementation:
274 // 275 //
275 276
276 void ExistingUserController::Observe( 277 void ExistingUserController::Observe(
277 int type, 278 int type,
278 const content::NotificationSource& source, 279 const content::NotificationSource& source,
(...skipping 991 matching lines...) Expand 10 before | Expand all | Expand 10 after
1270 } 1271 }
1271 1272
1272 // Otherwise, show the unrecoverable cryptohome error UI and ask user's 1273 // Otherwise, show the unrecoverable cryptohome error UI and ask user's
1273 // permission to collect a feedback. 1274 // permission to collect a feedback.
1274 RecordPasswordChangeFlow(LOGIN_PASSWORD_CHANGE_FLOW_CRYPTOHOME_FAILURE); 1275 RecordPasswordChangeFlow(LOGIN_PASSWORD_CHANGE_FLOW_CRYPTOHOME_FAILURE);
1275 VLOG(1) << "Show unrecoverable cryptohome error dialog."; 1276 VLOG(1) << "Show unrecoverable cryptohome error dialog.";
1276 login_display_->ShowUnrecoverableCrypthomeErrorDialog(); 1277 login_display_->ShowUnrecoverableCrypthomeErrorDialog();
1277 } 1278 }
1278 1279
1279 } // namespace chromeos 1280 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/app_launch_signin_screen.cc ('k') | chrome/browser/chromeos/login/kiosk_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698