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 <map> | 9 #include <map> |
10 #include <set> | 10 #include <set> |
(...skipping 365 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
376 this, | 376 this, |
377 chrome::NOTIFICATION_BROWSER_CLOSE_CANCELLED, | 377 chrome::NOTIFICATION_BROWSER_CLOSE_CANCELLED, |
378 content::NotificationService::AllSources()); | 378 content::NotificationService::AllSources()); |
379 | 379 |
380 if (ProfileShortcutManager::IsFeatureEnabled() && !user_data_dir_.empty()) | 380 if (ProfileShortcutManager::IsFeatureEnabled() && !user_data_dir_.empty()) |
381 profile_shortcut_manager_.reset(ProfileShortcutManager::Create( | 381 profile_shortcut_manager_.reset(ProfileShortcutManager::Create( |
382 this)); | 382 this)); |
383 } | 383 } |
384 | 384 |
385 ProfileManager::~ProfileManager() { | 385 ProfileManager::~ProfileManager() { |
| 386 DCHECK_CALLED_ON_VALID_THREAD(thread_checker_); |
386 } | 387 } |
387 | 388 |
388 #if BUILDFLAG(ENABLE_SESSION_SERVICE) | 389 #if BUILDFLAG(ENABLE_SESSION_SERVICE) |
389 // static | 390 // static |
390 void ProfileManager::ShutdownSessionServices() { | 391 void ProfileManager::ShutdownSessionServices() { |
391 ProfileManager* pm = g_browser_process->profile_manager(); | 392 ProfileManager* pm = g_browser_process->profile_manager(); |
392 if (!pm) // Is NULL when running unit tests. | 393 if (!pm) // Is NULL when running unit tests. |
393 return; | 394 return; |
394 std::vector<Profile*> profiles(pm->GetLoadedProfiles()); | 395 std::vector<Profile*> profiles(pm->GetLoadedProfiles()); |
395 for (size_t i = 0; i < profiles.size(); ++i) | 396 for (size_t i = 0; i < profiles.size(); ++i) |
(...skipping 1384 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1780 | 1781 |
1781 const base::FilePath new_active_profile_dir = | 1782 const base::FilePath new_active_profile_dir = |
1782 found_entry ? found_entry->GetPath() : GenerateNextProfileDirectoryPath(); | 1783 found_entry ? found_entry->GetPath() : GenerateNextProfileDirectoryPath(); |
1783 FinishDeletingProfile(profile_dir, new_active_profile_dir); | 1784 FinishDeletingProfile(profile_dir, new_active_profile_dir); |
1784 } | 1785 } |
1785 #endif // !defined(OS_ANDROID) | 1786 #endif // !defined(OS_ANDROID) |
1786 | 1787 |
1787 ProfileManagerWithoutInit::ProfileManagerWithoutInit( | 1788 ProfileManagerWithoutInit::ProfileManagerWithoutInit( |
1788 const base::FilePath& user_data_dir) : ProfileManager(user_data_dir) { | 1789 const base::FilePath& user_data_dir) : ProfileManager(user_data_dir) { |
1789 } | 1790 } |
OLD | NEW |