OLD | NEW |
---|---|
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 <stdint.h> | 7 #include <stdint.h> |
8 | 8 |
9 #include <set> | 9 #include <set> |
10 #include <string> | 10 #include <string> |
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
100 #endif | 100 #endif |
101 | 101 |
102 #if defined(ENABLE_SUPERVISED_USERS) | 102 #if defined(ENABLE_SUPERVISED_USERS) |
103 #include "chrome/browser/supervised_user/child_accounts/child_account_service.h" | 103 #include "chrome/browser/supervised_user/child_accounts/child_account_service.h" |
104 #include "chrome/browser/supervised_user/child_accounts/child_account_service_fa ctory.h" | 104 #include "chrome/browser/supervised_user/child_accounts/child_account_service_fa ctory.h" |
105 #include "chrome/browser/supervised_user/supervised_user_service.h" | 105 #include "chrome/browser/supervised_user/supervised_user_service.h" |
106 #include "chrome/browser/supervised_user/supervised_user_service_factory.h" | 106 #include "chrome/browser/supervised_user/supervised_user_service_factory.h" |
107 #endif | 107 #endif |
108 | 108 |
109 #if defined(OS_ANDROID) | 109 #if defined(OS_ANDROID) |
110 #include "chrome/browser/android/ntp/bookmark_suggestions_provider_factory.h" | |
110 #include "chrome/browser/android/ntp/offline_page_suggestions_provider_factory.h " | 111 #include "chrome/browser/android/ntp/offline_page_suggestions_provider_factory.h " |
111 #include "chrome/browser/ntp_snippets/content_suggestions_service_factory.h" | 112 #include "chrome/browser/ntp_snippets/content_suggestions_service_factory.h" |
112 #include "chrome/browser/ntp_snippets/ntp_snippets_service_factory.h" | 113 #include "chrome/browser/ntp_snippets/ntp_snippets_service_factory.h" |
113 #endif | 114 #endif |
114 | 115 |
115 #if defined(OS_CHROMEOS) | 116 #if defined(OS_CHROMEOS) |
116 #include "chrome/browser/browser_process_platform_part_chromeos.h" | 117 #include "chrome/browser/browser_process_platform_part_chromeos.h" |
117 #include "chrome/browser/chromeos/profiles/profile_helper.h" | 118 #include "chrome/browser/chromeos/profiles/profile_helper.h" |
118 #include "chromeos/chromeos_switches.h" | 119 #include "chromeos/chromeos_switches.h" |
119 #include "chromeos/dbus/cryptohome_client.h" | 120 #include "chromeos/dbus/cryptohome_client.h" |
(...skipping 1104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1224 // migration will be performed for all users it's planned to remove the | 1225 // migration will be performed for all users it's planned to remove the |
1225 // migration code, rough time estimates are Q1 2016. | 1226 // migration code, rough time estimates are Q1 2016. |
1226 PasswordManagerSettingMigratorServiceFactory::GetForProfile(profile) | 1227 PasswordManagerSettingMigratorServiceFactory::GetForProfile(profile) |
1227 ->InitializeMigration(ProfileSyncServiceFactory::GetForProfile(profile)); | 1228 ->InitializeMigration(ProfileSyncServiceFactory::GetForProfile(profile)); |
1228 | 1229 |
1229 #if defined(OS_ANDROID) | 1230 #if defined(OS_ANDROID) |
1230 // Service is responsible for fetching content snippets for the NTP. | 1231 // Service is responsible for fetching content snippets for the NTP. |
1231 ContentSuggestionsServiceFactory::GetForProfile(profile); | 1232 ContentSuggestionsServiceFactory::GetForProfile(profile); |
1232 NTPSnippetsServiceFactory::GetForProfile(profile); | 1233 NTPSnippetsServiceFactory::GetForProfile(profile); |
1233 OfflinePageSuggestionsProviderFactory::GetForProfile(profile); | 1234 OfflinePageSuggestionsProviderFactory::GetForProfile(profile); |
1235 BookmarkSuggestionsProviderFactory::GetForProfile(profile); | |
Bernhard Bauer
2016/07/29 10:28:51
Can we please not add any more initialization code
jkrcal
2016/07/29 13:57:17
Oh, did not know. Philipp is working on a CL that
Bernhard Bauer
2016/07/29 14:32:42
You mean all four? :)
If you absolutely can't get
jkrcal
2016/07/29 16:09:56
I am leaving for vacation. Did not manage to finis
| |
1234 #endif | 1236 #endif |
1235 } | 1237 } |
1236 | 1238 |
1237 void ProfileManager::DoFinalInitLogging(Profile* profile) { | 1239 void ProfileManager::DoFinalInitLogging(Profile* profile) { |
1238 TRACE_EVENT0("browser", "ProfileManager::DoFinalInitLogging"); | 1240 TRACE_EVENT0("browser", "ProfileManager::DoFinalInitLogging"); |
1239 // Count number of extensions in this profile. | 1241 // Count number of extensions in this profile. |
1240 int enabled_app_count = -1; | 1242 int enabled_app_count = -1; |
1241 #if defined(ENABLE_EXTENSIONS) | 1243 #if defined(ENABLE_EXTENSIONS) |
1242 enabled_app_count = GetEnabledAppCount(profile); | 1244 enabled_app_count = GetEnabledAppCount(profile); |
1243 #endif | 1245 #endif |
(...skipping 387 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1631 | 1633 |
1632 FinishDeletingProfile(profile_to_delete_path, new_active_profile_path); | 1634 FinishDeletingProfile(profile_to_delete_path, new_active_profile_path); |
1633 if (!original_callback.is_null()) | 1635 if (!original_callback.is_null()) |
1634 original_callback.Run(loaded_profile, status); | 1636 original_callback.Run(loaded_profile, status); |
1635 } | 1637 } |
1636 #endif // !defined(OS_ANDROID) | 1638 #endif // !defined(OS_ANDROID) |
1637 | 1639 |
1638 ProfileManagerWithoutInit::ProfileManagerWithoutInit( | 1640 ProfileManagerWithoutInit::ProfileManagerWithoutInit( |
1639 const base::FilePath& user_data_dir) : ProfileManager(user_data_dir) { | 1641 const base::FilePath& user_data_dir) : ProfileManager(user_data_dir) { |
1640 } | 1642 } |
OLD | NEW |