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

Side by Side Diff: chrome/browser/profiles/profile_impl.h

Issue 393343002: Rename "managed (mode|user)" to "supervised user" (part 7) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: more alphabetize (and rebase again) Created 6 years, 5 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 // This class gathers state related to a single user profile. 5 // This class gathers state related to a single user profile.
6 6
7 #ifndef CHROME_BROWSER_PROFILES_PROFILE_IMPL_H_ 7 #ifndef CHROME_BROWSER_PROFILES_PROFILE_IMPL_H_
8 #define CHROME_BROWSER_PROFILES_PROFILE_IMPL_H_ 8 #define CHROME_BROWSER_PROFILES_PROFILE_IMPL_H_
9 9
10 #include <string> 10 #include <string>
(...skipping 13 matching lines...) Expand all
24 class PrefService; 24 class PrefService;
25 class PrefServiceSyncable; 25 class PrefServiceSyncable;
26 class ShortcutsBackend; 26 class ShortcutsBackend;
27 class SSLConfigServiceManager; 27 class SSLConfigServiceManager;
28 class TrackedPreferenceValidationDelegate; 28 class TrackedPreferenceValidationDelegate;
29 29
30 #if defined(OS_CHROMEOS) 30 #if defined(OS_CHROMEOS)
31 namespace chromeos { 31 namespace chromeos {
32 class KioskTest; 32 class KioskTest;
33 class LocaleChangeGuard; 33 class LocaleChangeGuard;
34 class ManagedUserTestBase;
35 class Preferences; 34 class Preferences;
35 class SupervisedUserTestBase;
36 } 36 }
37 #endif 37 #endif
38 38
39 namespace base { 39 namespace base {
40 class SequencedTaskRunner; 40 class SequencedTaskRunner;
41 } 41 }
42 42
43 namespace domain_reliability { 43 namespace domain_reliability {
44 class DomainReliabilityMonitor; 44 class DomainReliabilityMonitor;
45 } 45 }
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 AppLocaleChangedVia) OVERRIDE; 136 AppLocaleChangedVia) OVERRIDE;
137 virtual void OnLogin() OVERRIDE; 137 virtual void OnLogin() OVERRIDE;
138 virtual void InitChromeOSPreferences() OVERRIDE; 138 virtual void InitChromeOSPreferences() OVERRIDE;
139 #endif // defined(OS_CHROMEOS) 139 #endif // defined(OS_CHROMEOS)
140 140
141 virtual PrefProxyConfigTracker* GetProxyConfigTracker() OVERRIDE; 141 virtual PrefProxyConfigTracker* GetProxyConfigTracker() OVERRIDE;
142 142
143 private: 143 private:
144 #if defined(OS_CHROMEOS) 144 #if defined(OS_CHROMEOS)
145 friend class chromeos::KioskTest; 145 friend class chromeos::KioskTest;
146 friend class chromeos::ManagedUserTestBase; 146 friend class chromeos::SupervisedUserTestBase;
147 #endif 147 #endif
148 friend class Profile; 148 friend class Profile;
149 friend class BetterSessionRestoreCrashTest; 149 friend class BetterSessionRestoreCrashTest;
150 FRIEND_TEST_ALL_PREFIXES(StartupBrowserCreatorTest, 150 FRIEND_TEST_ALL_PREFIXES(StartupBrowserCreatorTest,
151 ProfilesLaunchedAfterCrash); 151 ProfilesLaunchedAfterCrash);
152 FRIEND_TEST_ALL_PREFIXES(ProfileBrowserTest, DISABLED_ProfileReadmeCreated); 152 FRIEND_TEST_ALL_PREFIXES(ProfileBrowserTest, DISABLED_ProfileReadmeCreated);
153 FRIEND_TEST_ALL_PREFIXES(ProfileBrowserTest, 153 FRIEND_TEST_ALL_PREFIXES(ProfileBrowserTest,
154 ProfileDeletedBeforeReadmeCreated); 154 ProfileDeletedBeforeReadmeCreated);
155 155
156 // Delay, in milliseconds, before README file is created for a new profile. 156 // Delay, in milliseconds, before README file is created for a new profile.
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
282 // components/keyed_service/content/browser_context_keyed_service_factory.* 282 // components/keyed_service/content/browser_context_keyed_service_factory.*
283 283
284 Profile::Delegate* delegate_; 284 Profile::Delegate* delegate_;
285 285
286 chrome_browser_net::Predictor* predictor_; 286 chrome_browser_net::Predictor* predictor_;
287 287
288 DISALLOW_COPY_AND_ASSIGN(ProfileImpl); 288 DISALLOW_COPY_AND_ASSIGN(ProfileImpl);
289 }; 289 };
290 290
291 #endif // CHROME_BROWSER_PROFILES_PROFILE_IMPL_H_ 291 #endif // CHROME_BROWSER_PROFILES_PROFILE_IMPL_H_
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/profiles/profile_util.h ('k') | chrome/browser/signin/chrome_signin_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698