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

Side by Side Diff: chrome/browser/supervised_user/supervised_user_service.h

Issue 431893004: Use the display name on ChromeOS instead of the profile name. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address nit. Created 6 years, 4 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/supervised_user/supervised_user_service.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 CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_SERVICE_H_ 5 #ifndef CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_SERVICE_H_
6 #define CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_SERVICE_H_ 6 #define CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_SERVICE_H_
7 7
8 #include <set> 8 #include <set>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after
257 void UpdateSiteLists(); 257 void UpdateSiteLists();
258 258
259 // Updates the manual overrides for hosts in the URL filters when the 259 // Updates the manual overrides for hosts in the URL filters when the
260 // corresponding preference is changed. 260 // corresponding preference is changed.
261 void UpdateManualHosts(); 261 void UpdateManualHosts();
262 262
263 // Updates the manual overrides for URLs in the URL filters when the 263 // Updates the manual overrides for URLs in the URL filters when the
264 // corresponding preference is changed. 264 // corresponding preference is changed.
265 void UpdateManualURLs(); 265 void UpdateManualURLs();
266 266
267 // Returns the human readable name of the supervised user.
268 std::string GetSupervisedUserName() const;
269
267 // Owns us via the KeyedService mechanism. 270 // Owns us via the KeyedService mechanism.
268 Profile* profile_; 271 Profile* profile_;
269 272
270 bool active_; 273 bool active_;
271 274
272 Delegate* delegate_; 275 Delegate* delegate_;
273 276
274 #if defined(ENABLE_EXTENSIONS) 277 #if defined(ENABLE_EXTENSIONS)
275 ScopedObserver<extensions::ExtensionRegistry, 278 ScopedObserver<extensions::ExtensionRegistry,
276 extensions::ExtensionRegistryObserver> 279 extensions::ExtensionRegistryObserver>
(...skipping 19 matching lines...) Expand all
296 // Used to create permission requests. 299 // Used to create permission requests.
297 scoped_ptr<PermissionRequestCreator> permissions_creator_; 300 scoped_ptr<PermissionRequestCreator> permissions_creator_;
298 301
299 // True iff we are waiting for a permission request to be issued. 302 // True iff we are waiting for a permission request to be issued.
300 bool waiting_for_permissions_; 303 bool waiting_for_permissions_;
301 304
302 base::WeakPtrFactory<SupervisedUserService> weak_ptr_factory_; 305 base::WeakPtrFactory<SupervisedUserService> weak_ptr_factory_;
303 }; 306 };
304 307
305 #endif // CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_SERVICE_H_ 308 #endif // CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_SERVICE_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/supervised_user/supervised_user_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698