| Index: chrome/browser/profiles/profile_manager.cc
|
| diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profiles/profile_manager.cc
|
| index 4972c7c4d2290f1258182e63f50ac3e0b6f14ffd..2e98ee413510fb3fda9d367005b1e23427fd0cf3 100644
|
| --- a/chrome/browser/profiles/profile_manager.cc
|
| +++ b/chrome/browser/profiles/profile_manager.cc
|
| @@ -356,6 +356,7 @@ Profile* ProfileManager::GetActiveUserProfile() {
|
| return chromeos::ProfileHelper::Get()->GetProfileByUserUnsafe(user);
|
|
|
| #endif
|
| +#if !defined(OS_WIN)
|
| Profile* profile =
|
| profile_manager->GetActiveUserOrOffTheRecordProfileFromPath(
|
| profile_manager->user_data_dir());
|
| @@ -366,6 +367,10 @@ Profile* ProfileManager::GetActiveUserProfile() {
|
| // figure out how common this is. http://crbug.com/383019
|
| CHECK(profile) << profile_manager->user_data_dir().AsUTF8Unsafe();
|
| return profile;
|
| +#else
|
| + return profile_manager->GetProfile(
|
| + profile_manager->GetLastUsedProfileDir(profile_manager->user_data_dir()));
|
| +#endif
|
| }
|
|
|
| Profile* ProfileManager::GetProfile(const base::FilePath& profile_dir) {
|
|
|