| Index: chrome/browser/profiles/profile_manager.cc
|
| ===================================================================
|
| --- chrome/browser/profiles/profile_manager.cc (revision 111700)
|
| +++ chrome/browser/profiles/profile_manager.cc (working copy)
|
| @@ -322,7 +322,7 @@
|
| if (NULL != profile)
|
| return profile;
|
|
|
| - profile = CreateProfile(profile_dir);
|
| + profile = CreateProfileHelper(profile_dir);
|
| DCHECK(profile);
|
| if (profile) {
|
| bool result = AddProfile(profile);
|
| @@ -350,7 +350,7 @@
|
| } else {
|
| // Initiate asynchronous creation process.
|
| ProfileInfo* info =
|
| - RegisterProfile(Profile::CreateProfileAsync(user_data_dir, this),
|
| + RegisterProfile(CreateProfileAsyncHelper(user_data_dir, this),
|
| false);
|
| info->observers.push_back(observer);
|
| }
|
| @@ -486,10 +486,15 @@
|
| new ProfileSizeTask(profile), 112000);
|
| }
|
|
|
| -Profile* ProfileManager::CreateProfile(const FilePath& path) {
|
| +Profile* ProfileManager::CreateProfileHelper(const FilePath& path) {
|
| return Profile::CreateProfile(path);
|
| }
|
|
|
| +Profile* ProfileManager::CreateProfileAsyncHelper(const FilePath& path,
|
| + Delegate* delegate) {
|
| + return Profile::CreateProfileAsync(path, delegate);
|
| +}
|
| +
|
| void ProfileManager::OnProfileCreated(Profile* profile, bool success) {
|
| DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
|
|
|
|
|