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

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: Test-specific logic added: check for BrowserPolicyConnector existence used. Created 6 years, 7 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 <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 10
(...skipping 506 matching lines...) Expand 10 before | Expand all | Expand 10 after
517 base::CancelableClosure update_state_closure_; 517 base::CancelableClosure update_state_closure_;
518 base::CancelableClosure connecting_closure_; 518 base::CancelableClosure connecting_closure_;
519 519
520 content::NotificationRegistrar registrar_; 520 content::NotificationRegistrar registrar_;
521 521
522 // Whether there is an auth UI pending. This flag is set on receiving 522 // Whether there is an auth UI pending. This flag is set on receiving
523 // NOTIFICATION_AUTH_NEEDED and reset on either NOTIFICATION_AUTH_SUPPLIED or 523 // NOTIFICATION_AUTH_NEEDED and reset on either NOTIFICATION_AUTH_SUPPLIED or
524 // NOTIFICATION_AUTH_CANCELLED. 524 // NOTIFICATION_AUTH_CANCELLED.
525 bool has_pending_auth_ui_; 525 bool has_pending_auth_ui_;
526 526
527 scoped_ptr<CrosSettings::ObserverSubscription> allow_new_user_subscription_;
528 scoped_ptr<CrosSettings::ObserverSubscription> allow_guest_subscription_;
529 scoped_ptr<AutoEnrollmentController::ProgressCallbackList::Subscription> 527 scoped_ptr<AutoEnrollmentController::ProgressCallbackList::Subscription>
530 auto_enrollment_progress_subscription_; 528 auto_enrollment_progress_subscription_;
531 529
532 bool caps_lock_enabled_; 530 bool caps_lock_enabled_;
533 531
534 base::Closure kiosk_enable_flow_aborted_callback_for_test_; 532 base::Closure kiosk_enable_flow_aborted_callback_for_test_;
535 533
536 // Map of callbacks run when the custom button on a user pod is clicked. 534 // Map of callbacks run when the custom button on a user pod is clicked.
537 std::map<std::string, base::Closure> user_pod_button_callback_map_; 535 std::map<std::string, base::Closure> user_pod_button_callback_map_;
538 536
539 // Map of usernames to their current authentication type. If a user is not 537 // Map of usernames to their current authentication type. If a user is not
540 // contained in the map, it is using the default authentication type. 538 // contained in the map, it is using the default authentication type.
541 std::map<std::string, LoginDisplay::AuthType> user_auth_type_map_; 539 std::map<std::string, LoginDisplay::AuthType> user_auth_type_map_;
542 540
543 // Non-owning ptr. 541 // Non-owning ptr.
544 // TODO (ygorshenin@): remove this dependency. 542 // TODO (ygorshenin@): remove this dependency.
545 GaiaScreenHandler* gaia_screen_handler_; 543 GaiaScreenHandler* gaia_screen_handler_;
546 544
547 // Helper that retrieves the authenticated user's e-mail address. 545 // Helper that retrieves the authenticated user's e-mail address.
548 scoped_ptr<AuthenticatedUserEmailRetriever> email_retriever_; 546 scoped_ptr<AuthenticatedUserEmailRetriever> email_retriever_;
549 547
550 DISALLOW_COPY_AND_ASSIGN(SigninScreenHandler); 548 DISALLOW_COPY_AND_ASSIGN(SigninScreenHandler);
551 }; 549 };
552 550
553 } // namespace chromeos 551 } // namespace chromeos
554 552
555 #endif // CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_SIGNIN_SCREEN_HANDLER_H_ 553 #endif // CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_SIGNIN_SCREEN_HANDLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698