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 <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 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
55 #include "net/url_request/url_request_job.h" | 55 #include "net/url_request/url_request_job.h" |
56 #include "ui/base/l10n/l10n_util.h" | 56 #include "ui/base/l10n/l10n_util.h" |
57 | 57 |
58 #if defined(ENABLE_MANAGED_USERS) | 58 #if defined(ENABLE_MANAGED_USERS) |
59 #include "chrome/browser/managed_mode/managed_user_service.h" | 59 #include "chrome/browser/managed_mode/managed_user_service.h" |
60 #include "chrome/browser/managed_mode/managed_user_service_factory.h" | 60 #include "chrome/browser/managed_mode/managed_user_service_factory.h" |
61 #endif | 61 #endif |
62 | 62 |
63 #if !defined(OS_IOS) | 63 #if !defined(OS_IOS) |
64 #include "chrome/browser/extensions/extension_service.h" | 64 #include "chrome/browser/extensions/extension_service.h" |
65 #include "chrome/browser/extensions/extension_system.h" | |
66 #include "chrome/browser/sessions/session_service_factory.h" | 65 #include "chrome/browser/sessions/session_service_factory.h" |
67 #include "chrome/browser/ui/browser_list.h" | 66 #include "chrome/browser/ui/browser_list.h" |
| 67 #include "extensions/browser/extension_system.h" |
68 #endif // !defined (OS_IOS) | 68 #endif // !defined (OS_IOS) |
69 | 69 |
70 #if defined(OS_WIN) | 70 #if defined(OS_WIN) |
71 #include "base/win/metro.h" | 71 #include "base/win/metro.h" |
72 #include "chrome/installer/util/browser_distribution.h" | 72 #include "chrome/installer/util/browser_distribution.h" |
73 #endif | 73 #endif |
74 | 74 |
75 #if defined(OS_CHROMEOS) | 75 #if defined(OS_CHROMEOS) |
76 #include "chrome/browser/browser_process_platform_part_chromeos.h" | 76 #include "chrome/browser/browser_process_platform_part_chromeos.h" |
77 #include "chrome/browser/chromeos/login/user.h" | 77 #include "chrome/browser/chromeos/login/user.h" |
(...skipping 1156 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1234 last_non_managed_profile_path.BaseName().MaybeAsASCII()); | 1234 last_non_managed_profile_path.BaseName().MaybeAsASCII()); |
1235 FinishDeletingProfile(profile_to_delete_path); | 1235 FinishDeletingProfile(profile_to_delete_path); |
1236 } | 1236 } |
1237 } | 1237 } |
1238 } | 1238 } |
1239 #endif | 1239 #endif |
1240 | 1240 |
1241 ProfileManagerWithoutInit::ProfileManagerWithoutInit( | 1241 ProfileManagerWithoutInit::ProfileManagerWithoutInit( |
1242 const base::FilePath& user_data_dir) : ProfileManager(user_data_dir) { | 1242 const base::FilePath& user_data_dir) : ProfileManager(user_data_dir) { |
1243 } | 1243 } |
OLD | NEW |