| 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 253 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 264 std::vector<Profile*> ProfileManager::GetLastOpenedProfiles() { | 264 std::vector<Profile*> ProfileManager::GetLastOpenedProfiles() { |
| 265 ProfileManager* profile_manager = g_browser_process->profile_manager(); | 265 ProfileManager* profile_manager = g_browser_process->profile_manager(); |
| 266 return profile_manager->GetLastOpenedProfiles( | 266 return profile_manager->GetLastOpenedProfiles( |
| 267 profile_manager->user_data_dir_); | 267 profile_manager->user_data_dir_); |
| 268 } | 268 } |
| 269 | 269 |
| 270 ProfileManager::ProfileManager(const base::FilePath& user_data_dir) | 270 ProfileManager::ProfileManager(const base::FilePath& user_data_dir) |
| 271 : user_data_dir_(user_data_dir), | 271 : user_data_dir_(user_data_dir), |
| 272 logged_in_(false), | 272 logged_in_(false), |
| 273 will_import_(false), | 273 will_import_(false), |
| 274 profile_shortcut_manager_(NULL), | 274 |
| 275 #if !defined(OS_ANDROID) && !defined(OS_IOS) | 275 #if !defined(OS_ANDROID) && !defined(OS_IOS) |
| 276 browser_list_observer_(this), | 276 browser_list_observer_(this), |
| 277 #endif | 277 #endif |
| 278 closing_all_browsers_(false) { | 278 closing_all_browsers_(false) { |
| 279 #if defined(OS_CHROMEOS) | 279 #if defined(OS_CHROMEOS) |
| 280 registrar_.Add( | 280 registrar_.Add( |
| 281 this, | 281 this, |
| 282 chrome::NOTIFICATION_LOGIN_USER_CHANGED, | 282 chrome::NOTIFICATION_LOGIN_USER_CHANGED, |
| 283 content::NotificationService::AllSources()); | 283 content::NotificationService::AllSources()); |
| 284 #endif | 284 #endif |
| (...skipping 871 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1156 ProfileManager::ProfileInfo::ProfileInfo( | 1156 ProfileManager::ProfileInfo::ProfileInfo( |
| 1157 Profile* profile, | 1157 Profile* profile, |
| 1158 bool created) | 1158 bool created) |
| 1159 : profile(profile), | 1159 : profile(profile), |
| 1160 created(created) { | 1160 created(created) { |
| 1161 } | 1161 } |
| 1162 | 1162 |
| 1163 ProfileManager::ProfileInfo::~ProfileInfo() { | 1163 ProfileManager::ProfileInfo::~ProfileInfo() { |
| 1164 ProfileDestroyer::DestroyProfileWhenAppropriate(profile.release()); | 1164 ProfileDestroyer::DestroyProfileWhenAppropriate(profile.release()); |
| 1165 } | 1165 } |
| OLD | NEW |