| 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 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 73 #include "extensions/browser/extension_system.h" | 73 #include "extensions/browser/extension_system.h" |
| 74 #endif // !defined (OS_IOS) | 74 #endif // !defined (OS_IOS) |
| 75 | 75 |
| 76 #if defined(OS_WIN) | 76 #if defined(OS_WIN) |
| 77 #include "base/win/metro.h" | 77 #include "base/win/metro.h" |
| 78 #include "chrome/installer/util/browser_distribution.h" | 78 #include "chrome/installer/util/browser_distribution.h" |
| 79 #endif | 79 #endif |
| 80 | 80 |
| 81 #if defined(OS_CHROMEOS) | 81 #if defined(OS_CHROMEOS) |
| 82 #include "chrome/browser/browser_process_platform_part_chromeos.h" | 82 #include "chrome/browser/browser_process_platform_part_chromeos.h" |
| 83 #include "chrome/browser/chromeos/login/user.h" | 83 #include "chrome/browser/chromeos/login/users/user.h" |
| 84 #include "chrome/browser/chromeos/login/user_manager.h" | 84 #include "chrome/browser/chromeos/login/users/user_manager.h" |
| 85 #include "chrome/browser/chromeos/profiles/profile_helper.h" | 85 #include "chrome/browser/chromeos/profiles/profile_helper.h" |
| 86 #include "chrome/browser/profiles/profiles_state.h" | 86 #include "chrome/browser/profiles/profiles_state.h" |
| 87 #include "chromeos/chromeos_switches.h" | 87 #include "chromeos/chromeos_switches.h" |
| 88 #include "chromeos/dbus/cryptohome_client.h" | 88 #include "chromeos/dbus/cryptohome_client.h" |
| 89 #include "chromeos/dbus/dbus_thread_manager.h" | 89 #include "chromeos/dbus/dbus_thread_manager.h" |
| 90 #endif | 90 #endif |
| 91 | 91 |
| 92 using base::UserMetricsAction; | 92 using base::UserMetricsAction; |
| 93 using content::BrowserThread; | 93 using content::BrowserThread; |
| 94 | 94 |
| (...skipping 1178 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1273 last_non_managed_profile_path.BaseName().MaybeAsASCII()); | 1273 last_non_managed_profile_path.BaseName().MaybeAsASCII()); |
| 1274 FinishDeletingProfile(profile_to_delete_path); | 1274 FinishDeletingProfile(profile_to_delete_path); |
| 1275 } | 1275 } |
| 1276 } | 1276 } |
| 1277 } | 1277 } |
| 1278 #endif | 1278 #endif |
| 1279 | 1279 |
| 1280 ProfileManagerWithoutInit::ProfileManagerWithoutInit( | 1280 ProfileManagerWithoutInit::ProfileManagerWithoutInit( |
| 1281 const base::FilePath& user_data_dir) : ProfileManager(user_data_dir) { | 1281 const base::FilePath& user_data_dir) : ProfileManager(user_data_dir) { |
| 1282 } | 1282 } |
| OLD | NEW |