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

Side by Side Diff: chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc

Issue 335833003: Rename "managed (mode|user)" to "supervised user" (part 2) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review comments (+ a few other cleanups) 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 | « chrome/browser/profiles/avatar_menu.cc ('k') | chrome/browser/profiles/profile_impl.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 #include "chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.h" 5 #include "chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.h"
6 6
7 #include "chrome/browser/autocomplete/shortcuts_backend_factory.h" 7 #include "chrome/browser/autocomplete/shortcuts_backend_factory.h"
8 #include "chrome/browser/autofill/personal_data_manager_factory.h" 8 #include "chrome/browser/autofill/personal_data_manager_factory.h"
9 #include "chrome/browser/background/background_contents_service_factory.h" 9 #include "chrome/browser/background/background_contents_service_factory.h"
10 #include "chrome/browser/bookmarks/bookmark_model_factory.h" 10 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 #include "chrome/browser/chromeos/policy/user_network_configuration_updater_fact ory.h" 75 #include "chrome/browser/chromeos/policy/user_network_configuration_updater_fact ory.h"
76 #else 76 #else
77 #include "chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h" 77 #include "chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h"
78 #if !defined(OS_IOS) 78 #if !defined(OS_IOS)
79 #include "chrome/browser/policy/cloud/user_policy_signin_service_factory.h" 79 #include "chrome/browser/policy/cloud/user_policy_signin_service_factory.h"
80 #endif 80 #endif
81 #endif 81 #endif
82 #endif 82 #endif
83 83
84 #if defined(ENABLE_MANAGED_USERS) 84 #if defined(ENABLE_MANAGED_USERS)
85 #include "chrome/browser/managed_mode/managed_user_service_factory.h" 85 #include "chrome/browser/supervised_user/supervised_user_service_factory.h"
86 #include "chrome/browser/managed_mode/managed_user_sync_service_factory.h" 86 #include "chrome/browser/supervised_user/supervised_user_sync_service_factory.h"
87 #if defined(OS_CHROMEOS) 87 #if defined(OS_CHROMEOS)
88 #include "chrome/browser/managed_mode/chromeos/managed_user_password_service_fac tory.h" 88 #include "chrome/browser/supervised_user/chromeos/manager_password_service_facto ry.h"
89 #include "chrome/browser/managed_mode/chromeos/manager_password_service_factory. h" 89 #include "chrome/browser/supervised_user/chromeos/supervised_user_password_servi ce_factory.h"
90 #endif 90 #endif
91 #endif 91 #endif
92 92
93 #if defined(USE_AURA) 93 #if defined(USE_AURA)
94 #include "chrome/browser/ui/gesture_prefs_observer_factory_aura.h" 94 #include "chrome/browser/ui/gesture_prefs_observer_factory_aura.h"
95 #endif 95 #endif
96 96
97 #if defined(OS_ANDROID) 97 #if defined(OS_ANDROID)
98 #include "chrome/browser/media/protected_media_identifier_permission_context_fac tory.h" 98 #include "chrome/browser/media/protected_media_identifier_permission_context_fac tory.h"
99 #else 99 #else
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
188 GoogleURLTrackerFactory::GetInstance(); 188 GoogleURLTrackerFactory::GetInstance();
189 HistoryServiceFactory::GetInstance(); 189 HistoryServiceFactory::GetInstance();
190 HotwordServiceFactory::GetInstance(); 190 HotwordServiceFactory::GetInstance();
191 invalidation::ProfileInvalidationProviderFactory::GetInstance(); 191 invalidation::ProfileInvalidationProviderFactory::GetInstance();
192 InstantServiceFactory::GetInstance(); 192 InstantServiceFactory::GetInstance();
193 #if defined(ENABLE_SERVICE_DISCOVERY) 193 #if defined(ENABLE_SERVICE_DISCOVERY)
194 local_discovery::PrivetNotificationServiceFactory::GetInstance(); 194 local_discovery::PrivetNotificationServiceFactory::GetInstance();
195 #endif 195 #endif
196 #if defined(ENABLE_MANAGED_USERS) 196 #if defined(ENABLE_MANAGED_USERS)
197 #if defined(OS_CHROMEOS) 197 #if defined(OS_CHROMEOS)
198 chromeos::ManagedUserPasswordServiceFactory::GetInstance(); 198 chromeos::SupervisedUserPasswordServiceFactory::GetInstance();
199 chromeos::ManagerPasswordServiceFactory::GetInstance(); 199 chromeos::ManagerPasswordServiceFactory::GetInstance();
200 #endif 200 #endif
201 ManagedUserServiceFactory::GetInstance(); 201 SupervisedUserServiceFactory::GetInstance();
202 ManagedUserSyncServiceFactory::GetInstance(); 202 SupervisedUserSyncServiceFactory::GetInstance();
203 #endif 203 #endif
204 #if !defined(OS_ANDROID) 204 #if !defined(OS_ANDROID)
205 MediaGalleriesPreferencesFactory::GetInstance(); 205 MediaGalleriesPreferencesFactory::GetInstance();
206 notifier::ChromeNotifierServiceFactory::GetInstance(); 206 notifier::ChromeNotifierServiceFactory::GetInstance();
207 notifier::SyncedNotificationAppInfoServiceFactory::GetInstance(); 207 notifier::SyncedNotificationAppInfoServiceFactory::GetInstance();
208 NTPResourceCacheFactory::GetInstance(); 208 NTPResourceCacheFactory::GetInstance();
209 #endif 209 #endif
210 PasswordStoreFactory::GetInstance(); 210 PasswordStoreFactory::GetInstance();
211 #if !defined(OS_ANDROID) 211 #if !defined(OS_ANDROID)
212 PinnedTabServiceFactory::GetInstance(); 212 PinnedTabServiceFactory::GetInstance();
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
254 TemplateURLServiceFactory::GetInstance(); 254 TemplateURLServiceFactory::GetInstance();
255 #if defined(ENABLE_THEMES) 255 #if defined(ENABLE_THEMES)
256 ThemeServiceFactory::GetInstance(); 256 ThemeServiceFactory::GetInstance();
257 #endif 257 #endif
258 WebDataServiceFactory::GetInstance(); 258 WebDataServiceFactory::GetInstance();
259 } 259 }
260 260
261 void ChromeBrowserMainExtraPartsProfiles::PreProfileInit() { 261 void ChromeBrowserMainExtraPartsProfiles::PreProfileInit() {
262 EnsureBrowserContextKeyedServiceFactoriesBuilt(); 262 EnsureBrowserContextKeyedServiceFactoriesBuilt();
263 } 263 }
OLDNEW
« no previous file with comments | « chrome/browser/profiles/avatar_menu.cc ('k') | chrome/browser/profiles/profile_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698