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

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

Issue 789853002: Add support for child accounts on Android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: x Created 6 years 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
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 1000 matching lines...) Expand 10 before | Expand all | Expand 10 after
1011 // blockable extensions to block. 1011 // blockable extensions to block.
1012 size_t profile_index = cache.GetIndexOfProfileWithPath(profile->GetPath()); 1012 size_t profile_index = cache.GetIndexOfProfileWithPath(profile->GetPath());
1013 if (profile_index != std::string::npos && 1013 if (profile_index != std::string::npos &&
1014 cache.ProfileIsSigninRequiredAtIndex(profile_index)) { 1014 cache.ProfileIsSigninRequiredAtIndex(profile_index)) {
1015 extensions::ExtensionSystem::Get(profile) 1015 extensions::ExtensionSystem::Get(profile)
1016 ->extension_service() 1016 ->extension_service()
1017 ->BlockAllExtensions(); 1017 ->BlockAllExtensions();
1018 } 1018 }
1019 1019
1020 #endif 1020 #endif
1021 #if defined(ENABLE_SUPERVISED_USERS) && !defined(OS_ANDROID) 1021 #if defined(ENABLE_SUPERVISED_USERS)
1022 // Initialization needs to happen after extension system initialization (for 1022 // Initialization needs to happen after extension system initialization (for
1023 // extension::ManagementPolicy) and InitProfileUserPrefs (for setting the 1023 // extension::ManagementPolicy) and InitProfileUserPrefs (for setting the
1024 // initializing the supervised flag if necessary). 1024 // initializing the supervised flag if necessary).
1025 ChildAccountServiceFactory::GetForProfile(profile)->Init(); 1025 ChildAccountServiceFactory::GetForProfile(profile)->Init();
1026 SupervisedUserServiceFactory::GetForProfile(profile)->Init(); 1026 SupervisedUserServiceFactory::GetForProfile(profile)->Init();
1027 #endif 1027 #endif
1028 // Start the deferred task runners once the profile is loaded. 1028 // Start the deferred task runners once the profile is loaded.
1029 StartupTaskRunnerServiceFactory::GetForProfile(profile)-> 1029 StartupTaskRunnerServiceFactory::GetForProfile(profile)->
1030 StartDeferredTaskRunners(); 1030 StartDeferredTaskRunners();
1031 1031
(...skipping 316 matching lines...) Expand 10 before | Expand all | Expand 10 after
1348 last_non_supervised_profile_path.BaseName().MaybeAsASCII()); 1348 last_non_supervised_profile_path.BaseName().MaybeAsASCII());
1349 FinishDeletingProfile(profile_to_delete_path); 1349 FinishDeletingProfile(profile_to_delete_path);
1350 } 1350 }
1351 } 1351 }
1352 } 1352 }
1353 #endif 1353 #endif
1354 1354
1355 ProfileManagerWithoutInit::ProfileManagerWithoutInit( 1355 ProfileManagerWithoutInit::ProfileManagerWithoutInit(
1356 const base::FilePath& user_data_dir) : ProfileManager(user_data_dir) { 1356 const base::FilePath& user_data_dir) : ProfileManager(user_data_dir) {
1357 } 1357 }
OLDNEW
« no previous file with comments | « chrome/browser/android/chrome_jni_registrar.cc ('k') | chrome/browser/supervised_user/child_accounts/child_account_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698