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

Side by Side Diff: components/user_manager/user_manager_base.h

Issue 575653002: Revert of ash: Add checks for supervised users. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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
« no previous file with comments | « components/user_manager/user_manager.h ('k') | components/user_manager/user_manager_base.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 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 COMPONENTS_USER_MANAGER_USER_MANAGER_BASE_H_ 5 #ifndef COMPONENTS_USER_MANAGER_USER_MANAGER_BASE_H_
6 #define COMPONENTS_USER_MANAGER_USER_MANAGER_BASE_H_ 6 #define COMPONENTS_USER_MANAGER_USER_MANAGER_BASE_H_
7 7
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 virtual bool IsSessionStarted() const OVERRIDE; 95 virtual bool IsSessionStarted() const OVERRIDE;
96 virtual bool IsUserNonCryptohomeDataEphemeral( 96 virtual bool IsUserNonCryptohomeDataEphemeral(
97 const std::string& user_id) const OVERRIDE; 97 const std::string& user_id) const OVERRIDE;
98 virtual void AddObserver(UserManager::Observer* obs) OVERRIDE; 98 virtual void AddObserver(UserManager::Observer* obs) OVERRIDE;
99 virtual void RemoveObserver(UserManager::Observer* obs) OVERRIDE; 99 virtual void RemoveObserver(UserManager::Observer* obs) OVERRIDE;
100 virtual void AddSessionStateObserver( 100 virtual void AddSessionStateObserver(
101 UserManager::UserSessionStateObserver* obs) OVERRIDE; 101 UserManager::UserSessionStateObserver* obs) OVERRIDE;
102 virtual void RemoveSessionStateObserver( 102 virtual void RemoveSessionStateObserver(
103 UserManager::UserSessionStateObserver* obs) OVERRIDE; 103 UserManager::UserSessionStateObserver* obs) OVERRIDE;
104 virtual void NotifyLocalStateChanged() OVERRIDE; 104 virtual void NotifyLocalStateChanged() OVERRIDE;
105 virtual void ForceUpdateState() OVERRIDE;
106 105
107 // Helper function that copies users from |users_list| to |users_vector| and 106 // Helper function that copies users from |users_list| to |users_vector| and
108 // |users_set|. Duplicates and users already present in |existing_users| are 107 // |users_set|. Duplicates and users already present in |existing_users| are
109 // skipped. 108 // skipped.
110 static void ParseUserList(const base::ListValue& users_list, 109 static void ParseUserList(const base::ListValue& users_list,
111 const std::set<std::string>& existing_users, 110 const std::set<std::string>& existing_users,
112 std::vector<std::string>* users_vector, 111 std::vector<std::string>* users_vector,
113 std::set<std::string>* users_set); 112 std::set<std::string>* users_set);
114 113
115 protected: 114 protected:
(...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after
376 scoped_refptr<base::TaskRunner> blocking_task_runner_; 375 scoped_refptr<base::TaskRunner> blocking_task_runner_;
377 376
378 base::WeakPtrFactory<UserManagerBase> weak_factory_; 377 base::WeakPtrFactory<UserManagerBase> weak_factory_;
379 378
380 DISALLOW_COPY_AND_ASSIGN(UserManagerBase); 379 DISALLOW_COPY_AND_ASSIGN(UserManagerBase);
381 }; 380 };
382 381
383 } // namespace user_manager 382 } // namespace user_manager
384 383
385 #endif // COMPONENTS_USER_MANAGER_USER_MANAGER_BASE_H_ 384 #endif // COMPONENTS_USER_MANAGER_USER_MANAGER_BASE_H_
OLDNEW
« no previous file with comments | « components/user_manager/user_manager.h ('k') | components/user_manager/user_manager_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698