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

Side by Side Diff: chrome/browser/chromeos/login/existing_user_controller.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) 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 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_EXISTING_USER_CONTROLLER_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_EXISTING_USER_CONTROLLER_H_
6 #define CHROME_BROWSER_CHROMEOS_LOGIN_EXISTING_USER_CONTROLLER_H_ 6 #define CHROME_BROWSER_CHROMEOS_LOGIN_EXISTING_USER_CONTROLLER_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after
297 // from showing the screen until a successful login is performed. 297 // from showing the screen until a successful login is performed.
298 base::Time time_init_; 298 base::Time time_init_;
299 299
300 // Timer for the interval to wait for the reboot after TPM error UI was shown. 300 // Timer for the interval to wait for the reboot after TPM error UI was shown.
301 base::OneShotTimer<ExistingUserController> reboot_timer_; 301 base::OneShotTimer<ExistingUserController> reboot_timer_;
302 302
303 scoped_ptr<login::NetworkStateHelper> network_state_helper_; 303 scoped_ptr<login::NetworkStateHelper> network_state_helper_;
304 304
305 scoped_ptr<CrosSettings::ObserverSubscription> show_user_names_subscription_; 305 scoped_ptr<CrosSettings::ObserverSubscription> show_user_names_subscription_;
306 scoped_ptr<CrosSettings::ObserverSubscription> allow_new_user_subscription_; 306 scoped_ptr<CrosSettings::ObserverSubscription> allow_new_user_subscription_;
307 scoped_ptr<CrosSettings::ObserverSubscription>
308 allow_supervised_user_subscription_;
307 scoped_ptr<CrosSettings::ObserverSubscription> allow_guest_subscription_; 309 scoped_ptr<CrosSettings::ObserverSubscription> allow_guest_subscription_;
308 scoped_ptr<CrosSettings::ObserverSubscription> users_subscription_; 310 scoped_ptr<CrosSettings::ObserverSubscription> users_subscription_;
309 scoped_ptr<CrosSettings::ObserverSubscription> 311 scoped_ptr<CrosSettings::ObserverSubscription>
310 local_account_auto_login_id_subscription_; 312 local_account_auto_login_id_subscription_;
311 scoped_ptr<CrosSettings::ObserverSubscription> 313 scoped_ptr<CrosSettings::ObserverSubscription>
312 local_account_auto_login_delay_subscription_; 314 local_account_auto_login_delay_subscription_;
313 315
314 FRIEND_TEST_ALL_PREFIXES(ExistingUserControllerTest, ExistingUserLogin); 316 FRIEND_TEST_ALL_PREFIXES(ExistingUserControllerTest, ExistingUserLogin);
315 317
316 DISALLOW_COPY_AND_ASSIGN(ExistingUserController); 318 DISALLOW_COPY_AND_ASSIGN(ExistingUserController);
317 }; 319 };
318 320
319 } // namespace chromeos 321 } // namespace chromeos
320 322
321 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_EXISTING_USER_CONTROLLER_H_ 323 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_EXISTING_USER_CONTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698