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

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

Issue 462043002: Don't initialize SupervisedUserService at profile creation on Android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #include "chrome/browser/profiles/profile_manager.h" 5 #include "chrome/browser/profiles/profile_manager.h"
6 6
7 #include <set> 7 #include <set>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 986 matching lines...) Expand 10 before | Expand all | Expand 10 after
997 #if defined(ENABLE_EXTENSIONS) 997 #if defined(ENABLE_EXTENSIONS)
998 extensions::ExtensionSystem::Get(profile)->InitForRegularProfile( 998 extensions::ExtensionSystem::Get(profile)->InitForRegularProfile(
999 !go_off_the_record); 999 !go_off_the_record);
1000 // During tests, when |profile| is an instance of TestingProfile, 1000 // During tests, when |profile| is an instance of TestingProfile,
1001 // ExtensionSystem might not create an ExtensionService. 1001 // ExtensionSystem might not create an ExtensionService.
1002 if (extensions::ExtensionSystem::Get(profile)->extension_service()) { 1002 if (extensions::ExtensionSystem::Get(profile)->extension_service()) {
1003 profile->GetHostContentSettingsMap()->RegisterExtensionService( 1003 profile->GetHostContentSettingsMap()->RegisterExtensionService(
1004 extensions::ExtensionSystem::Get(profile)->extension_service()); 1004 extensions::ExtensionSystem::Get(profile)->extension_service());
1005 } 1005 }
1006 #endif 1006 #endif
1007 #if defined(ENABLE_MANAGED_USERS) 1007 #if defined(ENABLE_MANAGED_USERS) && !defined(OS_ANDROID)
1008 // Initialization needs to happen after extension system initialization (for 1008 // Initialization needs to happen after extension system initialization (for
1009 // extension::ManagementPolicy) and InitProfileUserPrefs (for setting the 1009 // extension::ManagementPolicy) and InitProfileUserPrefs (for setting the
1010 // initializing the supervised flag if necessary). 1010 // initializing the supervised flag if necessary).
1011 SupervisedUserServiceFactory::GetForProfile(profile)->Init(); 1011 SupervisedUserServiceFactory::GetForProfile(profile)->Init();
1012 #endif 1012 #endif
1013 // Start the deferred task runners once the profile is loaded. 1013 // Start the deferred task runners once the profile is loaded.
1014 StartupTaskRunnerServiceFactory::GetForProfile(profile)-> 1014 StartupTaskRunnerServiceFactory::GetForProfile(profile)->
1015 StartDeferredTaskRunners(); 1015 StartDeferredTaskRunners();
1016 1016
1017 AccountReconcilorFactory::GetForProfile(profile); 1017 AccountReconcilorFactory::GetForProfile(profile);
(...skipping 306 matching lines...) Expand 10 before | Expand all | Expand 10 after
1324 last_non_supervised_profile_path.BaseName().MaybeAsASCII()); 1324 last_non_supervised_profile_path.BaseName().MaybeAsASCII());
1325 FinishDeletingProfile(profile_to_delete_path); 1325 FinishDeletingProfile(profile_to_delete_path);
1326 } 1326 }
1327 } 1327 }
1328 } 1328 }
1329 #endif 1329 #endif
1330 1330
1331 ProfileManagerWithoutInit::ProfileManagerWithoutInit( 1331 ProfileManagerWithoutInit::ProfileManagerWithoutInit(
1332 const base::FilePath& user_data_dir) : ProfileManager(user_data_dir) { 1332 const base::FilePath& user_data_dir) : ProfileManager(user_data_dir) {
1333 } 1333 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698