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

Side by Side Diff: chrome/browser/chromeos/login/users/user_manager_impl.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_USERS_USER_MANAGER_IMPL_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_USERS_USER_MANAGER_IMPL_H_
6 #define CHROME_BROWSER_CHROMEOS_LOGIN_USERS_USER_MANAGER_IMPL_H_ 6 #define CHROME_BROWSER_CHROMEOS_LOGIN_USERS_USER_MANAGER_IMPL_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 453 matching lines...) Expand 10 before | Expand all | Expand 10 after
464 464
465 // User sessions that have to be restored after browser crash. 465 // User sessions that have to be restored after browser crash.
466 // [user_id] > [user_id_hash] 466 // [user_id] > [user_id_hash]
467 SessionManagerClient::ActiveSessionsMap pending_user_sessions_; 467 SessionManagerClient::ActiveSessionsMap pending_user_sessions_;
468 468
469 // Time at which this object was created. 469 // Time at which this object was created.
470 base::TimeTicks manager_creation_time_; 470 base::TimeTicks manager_creation_time_;
471 471
472 scoped_ptr<CrosSettings::ObserverSubscription> 472 scoped_ptr<CrosSettings::ObserverSubscription>
473 local_accounts_subscription_; 473 local_accounts_subscription_;
474 scoped_ptr<CrosSettings::ObserverSubscription>
475 supervised_users_subscription_;
476 474
477 scoped_ptr<MultiProfileUserController> multi_profile_user_controller_; 475 scoped_ptr<MultiProfileUserController> multi_profile_user_controller_;
478 476
479 // Observer for the policy that can be used to manage user images. 477 // Observer for the policy that can be used to manage user images.
480 scoped_ptr<policy::CloudExternalDataPolicyObserver> avatar_policy_observer_; 478 scoped_ptr<policy::CloudExternalDataPolicyObserver> avatar_policy_observer_;
481 479
482 // Observer for the policy that can be used to manage wallpapers. 480 // Observer for the policy that can be used to manage wallpapers.
483 scoped_ptr<policy::CloudExternalDataPolicyObserver> 481 scoped_ptr<policy::CloudExternalDataPolicyObserver>
484 wallpaper_policy_observer_; 482 wallpaper_policy_observer_;
485 483
486 // ID of the user just added to the session that needs to be activated 484 // ID of the user just added to the session that needs to be activated
487 // as soon as user's profile is loaded. 485 // as soon as user's profile is loaded.
488 std::string pending_user_switch_; 486 std::string pending_user_switch_;
489 487
490 DISALLOW_COPY_AND_ASSIGN(UserManagerImpl); 488 DISALLOW_COPY_AND_ASSIGN(UserManagerImpl);
491 }; 489 };
492 490
493 } // namespace chromeos 491 } // namespace chromeos
494 492
495 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_USERS_USER_MANAGER_IMPL_H_ 493 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_USERS_USER_MANAGER_IMPL_H_
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/existing_user_controller.cc ('k') | chrome/browser/chromeos/login/users/user_manager_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698