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

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: 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
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/existing_user_controller.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 287 matching lines...) Expand 10 before | Expand all | Expand 10 after
298 // from showing the screen until a successful login is performed. 298 // from showing the screen until a successful login is performed.
299 base::Time time_init_; 299 base::Time time_init_;
300 300
301 // Timer for the interval to wait for the reboot after TPM error UI was shown. 301 // Timer for the interval to wait for the reboot after TPM error UI was shown.
302 base::OneShotTimer<ExistingUserController> reboot_timer_; 302 base::OneShotTimer<ExistingUserController> reboot_timer_;
303 303
304 scoped_ptr<login::NetworkStateHelper> network_state_helper_; 304 scoped_ptr<login::NetworkStateHelper> network_state_helper_;
305 305
306 scoped_ptr<CrosSettings::ObserverSubscription> show_user_names_subscription_; 306 scoped_ptr<CrosSettings::ObserverSubscription> show_user_names_subscription_;
307 scoped_ptr<CrosSettings::ObserverSubscription> allow_new_user_subscription_; 307 scoped_ptr<CrosSettings::ObserverSubscription> allow_new_user_subscription_;
308 scoped_ptr<CrosSettings::ObserverSubscription>
309 allow_supervised_user_subscription_;
308 scoped_ptr<CrosSettings::ObserverSubscription> allow_guest_subscription_; 310 scoped_ptr<CrosSettings::ObserverSubscription> allow_guest_subscription_;
309 scoped_ptr<CrosSettings::ObserverSubscription> users_subscription_; 311 scoped_ptr<CrosSettings::ObserverSubscription> users_subscription_;
310 scoped_ptr<CrosSettings::ObserverSubscription> 312 scoped_ptr<CrosSettings::ObserverSubscription>
311 local_account_auto_login_id_subscription_; 313 local_account_auto_login_id_subscription_;
312 scoped_ptr<CrosSettings::ObserverSubscription> 314 scoped_ptr<CrosSettings::ObserverSubscription>
313 local_account_auto_login_delay_subscription_; 315 local_account_auto_login_delay_subscription_;
314 316
315 FRIEND_TEST_ALL_PREFIXES(ExistingUserControllerTest, ExistingUserLogin); 317 FRIEND_TEST_ALL_PREFIXES(ExistingUserControllerTest, ExistingUserLogin);
316 318
317 DISALLOW_COPY_AND_ASSIGN(ExistingUserController); 319 DISALLOW_COPY_AND_ASSIGN(ExistingUserController);
318 }; 320 };
319 321
320 } // namespace chromeos 322 } // namespace chromeos
321 323
322 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_EXISTING_USER_CONTROLLER_H_ 324 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_EXISTING_USER_CONTROLLER_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/existing_user_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698