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

Side by Side Diff: chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h

Issue 228553002: Preference dis/allowing supervised users creation is now available as owner setting, not only as de… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Unnecessary callback removed. Patch applied for failing tests. Created 6 years, 6 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 #ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_SIGNIN_SCREEN_HANDLER_H_ 5 #ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_SIGNIN_SCREEN_HANDLER_H_
6 #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_SIGNIN_SCREEN_HANDLER_H_ 6 #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_SIGNIN_SCREEN_HANDLER_H_
7 7
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 504 matching lines...) Expand 10 before | Expand all | Expand 10 after
515 base::CancelableClosure update_state_closure_; 515 base::CancelableClosure update_state_closure_;
516 base::CancelableClosure connecting_closure_; 516 base::CancelableClosure connecting_closure_;
517 517
518 content::NotificationRegistrar registrar_; 518 content::NotificationRegistrar registrar_;
519 519
520 // Whether there is an auth UI pending. This flag is set on receiving 520 // Whether there is an auth UI pending. This flag is set on receiving
521 // NOTIFICATION_AUTH_NEEDED and reset on either NOTIFICATION_AUTH_SUPPLIED or 521 // NOTIFICATION_AUTH_NEEDED and reset on either NOTIFICATION_AUTH_SUPPLIED or
522 // NOTIFICATION_AUTH_CANCELLED. 522 // NOTIFICATION_AUTH_CANCELLED.
523 bool has_pending_auth_ui_; 523 bool has_pending_auth_ui_;
524 524
525 scoped_ptr<CrosSettings::ObserverSubscription> allow_new_user_subscription_;
526 scoped_ptr<CrosSettings::ObserverSubscription> allow_guest_subscription_;
527 scoped_ptr<AutoEnrollmentController::ProgressCallbackList::Subscription> 525 scoped_ptr<AutoEnrollmentController::ProgressCallbackList::Subscription>
528 auto_enrollment_progress_subscription_; 526 auto_enrollment_progress_subscription_;
529 527
530 bool caps_lock_enabled_; 528 bool caps_lock_enabled_;
531 529
532 base::Closure kiosk_enable_flow_aborted_callback_for_test_; 530 base::Closure kiosk_enable_flow_aborted_callback_for_test_;
533 531
534 // Map of usernames to their current authentication type. If a user is not 532 // Map of usernames to their current authentication type. If a user is not
535 // contained in the map, it is using the default authentication type. 533 // contained in the map, it is using the default authentication type.
536 std::map<std::string, ScreenlockBridge::LockHandler::AuthType> 534 std::map<std::string, ScreenlockBridge::LockHandler::AuthType>
537 user_auth_type_map_; 535 user_auth_type_map_;
538 536
539 // Non-owning ptr. 537 // Non-owning ptr.
540 // TODO (ygorshenin@): remove this dependency. 538 // TODO (ygorshenin@): remove this dependency.
541 GaiaScreenHandler* gaia_screen_handler_; 539 GaiaScreenHandler* gaia_screen_handler_;
542 540
543 // Helper that retrieves the authenticated user's e-mail address. 541 // Helper that retrieves the authenticated user's e-mail address.
544 scoped_ptr<AuthenticatedUserEmailRetriever> email_retriever_; 542 scoped_ptr<AuthenticatedUserEmailRetriever> email_retriever_;
545 543
546 DISALLOW_COPY_AND_ASSIGN(SigninScreenHandler); 544 DISALLOW_COPY_AND_ASSIGN(SigninScreenHandler);
547 }; 545 };
548 546
549 } // namespace chromeos 547 } // namespace chromeos
550 548
551 #endif // CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_SIGNIN_SCREEN_HANDLER_H_ 549 #endif // CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_SIGNIN_SCREEN_HANDLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698