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 <set> | 5 #include <set> |
6 | 6 |
7 #include "chrome/browser/profiles/profile_manager.h" | 7 #include "chrome/browser/profiles/profile_manager.h" |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
11 #include "base/file_path.h" | 11 #include "base/file_path.h" |
12 #include "base/file_util.h" | 12 #include "base/file_util.h" |
13 #include "base/metrics/field_trial.h" | 13 #include "base/metrics/field_trial.h" |
14 #include "base/metrics/histogram.h" | 14 #include "base/metrics/histogram.h" |
15 #include "base/string_number_conversions.h" | 15 #include "base/string_number_conversions.h" |
16 #include "base/string_util.h" | 16 #include "base/string_util.h" |
17 #include "base/utf_string_conversions.h" | 17 #include "base/utf_string_conversions.h" |
18 #include "chrome/browser/browser_process.h" | 18 #include "chrome/browser/browser_process.h" |
19 #include "chrome/browser/extensions/default_apps_trial.h" | 19 #include "chrome/browser/extensions/default_apps_trial.h" |
20 #include "chrome/browser/extensions/extension_service.h" | 20 #include "chrome/browser/extensions/extension_service.h" |
| 21 #include "chrome/browser/extensions/extension_system.h" |
| 22 #include "chrome/browser/extensions/extension_system_factory.h" |
21 #include "chrome/browser/prefs/pref_service.h" | 23 #include "chrome/browser/prefs/pref_service.h" |
22 #include "chrome/browser/prefs/scoped_user_pref_update.h" | 24 #include "chrome/browser/prefs/scoped_user_pref_update.h" |
23 #include "chrome/browser/profiles/profile_info_cache.h" | 25 #include "chrome/browser/profiles/profile_info_cache.h" |
24 #include "chrome/browser/profiles/profile_metrics.h" | 26 #include "chrome/browser/profiles/profile_metrics.h" |
25 #include "chrome/browser/sessions/session_service_factory.h" | 27 #include "chrome/browser/sessions/session_service_factory.h" |
26 #include "chrome/browser/sync/profile_sync_service.h" | 28 #include "chrome/browser/sync/profile_sync_service.h" |
27 #include "chrome/browser/sync/profile_sync_service_factory.h" | 29 #include "chrome/browser/sync/profile_sync_service_factory.h" |
28 #include "chrome/browser/ui/browser.h" | 30 #include "chrome/browser/ui/browser.h" |
29 #include "chrome/browser/ui/browser_window.h" | 31 #include "chrome/browser/ui/browser_window.h" |
30 #include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h" | 32 #include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h" |
(...skipping 530 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
561 AddProfileToCache(profile); | 563 AddProfileToCache(profile); |
562 DoFinalInitLogging(profile); | 564 DoFinalInitLogging(profile); |
563 #if defined(OS_WIN) | 565 #if defined(OS_WIN) |
564 CreateDesktopShortcut(profile); | 566 CreateDesktopShortcut(profile); |
565 #endif | 567 #endif |
566 } | 568 } |
567 | 569 |
568 void ProfileManager::DoFinalInitForServices(Profile* profile, | 570 void ProfileManager::DoFinalInitForServices(Profile* profile, |
569 bool go_off_the_record) { | 571 bool go_off_the_record) { |
570 const CommandLine& command_line = *CommandLine::ForCurrentProcess(); | 572 const CommandLine& command_line = *CommandLine::ForCurrentProcess(); |
571 profile->InitExtensions(!go_off_the_record); | 573 ExtensionSystemFactory::GetForProfile(profile)->Init(!go_off_the_record); |
572 if (!command_line.HasSwitch(switches::kDisableWebResources)) | 574 if (!command_line.HasSwitch(switches::kDisableWebResources)) |
573 profile->InitPromoResources(); | 575 profile->InitPromoResources(); |
574 } | 576 } |
575 | 577 |
576 void ProfileManager::DoFinalInitLogging(Profile* profile) { | 578 void ProfileManager::DoFinalInitLogging(Profile* profile) { |
577 // Count number of extensions in this profile. | 579 // Count number of extensions in this profile. |
578 int extension_count = -1; | 580 int extension_count = -1; |
579 ExtensionService* extension_service = profile->GetExtensionService(); | 581 ExtensionService* extension_service = profile->GetExtensionService(); |
580 if (extension_service) | 582 if (extension_service) |
581 extension_count = extension_service->GetAppIds().size(); | 583 extension_count = extension_service->GetAppIds().size(); |
(...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
881 AddProfileToCache(profile); | 883 AddProfileToCache(profile); |
882 } | 884 } |
883 } | 885 } |
884 | 886 |
885 void ProfileManager::RunCallbacks(const std::vector<CreateCallback>& callbacks, | 887 void ProfileManager::RunCallbacks(const std::vector<CreateCallback>& callbacks, |
886 Profile* profile, | 888 Profile* profile, |
887 Profile::CreateStatus status) { | 889 Profile::CreateStatus status) { |
888 for (size_t i = 0; i < callbacks.size(); ++i) | 890 for (size_t i = 0; i < callbacks.size(); ++i) |
889 callbacks[i].Run(profile, status); | 891 callbacks[i].Run(profile, status); |
890 } | 892 } |
OLD | NEW |