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

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

Issue 902833003: Add a HostContentSettingsMap layer for Supervised Users. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed comments. Created 5 years, 9 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
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 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 #include "extensions/browser/extension_system.h" 72 #include "extensions/browser/extension_system.h"
73 #include "extensions/common/extension_set.h" 73 #include "extensions/common/extension_set.h"
74 #include "extensions/common/manifest.h" 74 #include "extensions/common/manifest.h"
75 #endif 75 #endif
76 76
77 #if defined(ENABLE_SUPERVISED_USERS) 77 #if defined(ENABLE_SUPERVISED_USERS)
78 #include "chrome/browser/supervised_user/child_accounts/child_account_service.h" 78 #include "chrome/browser/supervised_user/child_accounts/child_account_service.h"
79 #include "chrome/browser/supervised_user/child_accounts/child_account_service_fa ctory.h" 79 #include "chrome/browser/supervised_user/child_accounts/child_account_service_fa ctory.h"
80 #include "chrome/browser/supervised_user/supervised_user_service.h" 80 #include "chrome/browser/supervised_user/supervised_user_service.h"
81 #include "chrome/browser/supervised_user/supervised_user_service_factory.h" 81 #include "chrome/browser/supervised_user/supervised_user_service_factory.h"
82 #include "chrome/browser/supervised_user/supervised_user_settings_service.h"
83 #include "chrome/browser/supervised_user/supervised_user_settings_service_factor y.h"
82 #endif 84 #endif
83 85
84 #if !defined(OS_IOS) 86 #if !defined(OS_IOS)
85 #include "chrome/browser/sessions/session_service_factory.h" 87 #include "chrome/browser/sessions/session_service_factory.h"
86 #include "chrome/browser/ui/browser_list.h" 88 #include "chrome/browser/ui/browser_list.h"
87 #endif // !defined (OS_IOS) 89 #endif // !defined (OS_IOS)
88 90
89 #if defined(OS_WIN) 91 #if defined(OS_WIN)
90 #include "base/win/metro.h" 92 #include "base/win/metro.h"
91 #include "chrome/installer/util/browser_distribution.h" 93 #include "chrome/installer/util/browser_distribution.h"
(...skipping 946 matching lines...) Expand 10 before | Expand all | Expand 10 after
1038 ->BlockAllExtensions(); 1040 ->BlockAllExtensions();
1039 } 1041 }
1040 1042
1041 #endif 1043 #endif
1042 #if defined(ENABLE_SUPERVISED_USERS) 1044 #if defined(ENABLE_SUPERVISED_USERS)
1043 // Initialization needs to happen after extension system initialization (for 1045 // Initialization needs to happen after extension system initialization (for
1044 // extension::ManagementPolicy) and InitProfileUserPrefs (for setting the 1046 // extension::ManagementPolicy) and InitProfileUserPrefs (for setting the
1045 // initializing the supervised flag if necessary). 1047 // initializing the supervised flag if necessary).
1046 ChildAccountServiceFactory::GetForProfile(profile)->Init(); 1048 ChildAccountServiceFactory::GetForProfile(profile)->Init();
1047 SupervisedUserServiceFactory::GetForProfile(profile)->Init(); 1049 SupervisedUserServiceFactory::GetForProfile(profile)->Init();
1050 SupervisedUserSettingsService* supervised_service =
1051 SupervisedUserSettingsServiceFactory::GetForProfile(profile);
1052 supervised_service->RegisterContentSettings(
1053 profile->GetHostContentSettingsMap());
1048 #endif 1054 #endif
1049 // Start the deferred task runners once the profile is loaded. 1055 // Start the deferred task runners once the profile is loaded.
1050 StartupTaskRunnerServiceFactory::GetForProfile(profile)-> 1056 StartupTaskRunnerServiceFactory::GetForProfile(profile)->
1051 StartDeferredTaskRunners(); 1057 StartDeferredTaskRunners();
1052 1058
1053 // Activate data reduction proxy. This creates a request context and makes a 1059 // Activate data reduction proxy. This creates a request context and makes a
1054 // URL request to check if the data reduction proxy server is reachable. 1060 // URL request to check if the data reduction proxy server is reachable.
1055 DataReductionProxyChromeSettingsFactory::GetForBrowserContext(profile)-> 1061 DataReductionProxyChromeSettingsFactory::GetForBrowserContext(profile)->
1056 MaybeActivateDataReductionProxy(true); 1062 MaybeActivateDataReductionProxy(true);
1057 1063
(...skipping 341 matching lines...) Expand 10 before | Expand all | Expand 10 after
1399 last_non_supervised_profile_path.BaseName().MaybeAsASCII()); 1405 last_non_supervised_profile_path.BaseName().MaybeAsASCII());
1400 FinishDeletingProfile(profile_to_delete_path); 1406 FinishDeletingProfile(profile_to_delete_path);
1401 } 1407 }
1402 } 1408 }
1403 } 1409 }
1404 #endif 1410 #endif
1405 1411
1406 ProfileManagerWithoutInit::ProfileManagerWithoutInit( 1412 ProfileManagerWithoutInit::ProfileManagerWithoutInit(
1407 const base::FilePath& user_data_dir) : ProfileManager(user_data_dir) { 1413 const base::FilePath& user_data_dir) : ProfileManager(user_data_dir) {
1408 } 1414 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698