| Index: chrome/browser/profiles/profile_loader.cc
|
| diff --git a/chrome/browser/profiles/profile_loader.cc b/chrome/browser/profiles/profile_loader.cc
|
| deleted file mode 100644
|
| index 4d2a6e6c96e092dacccf1d6b0821fe548b196219..0000000000000000000000000000000000000000
|
| --- a/chrome/browser/profiles/profile_loader.cc
|
| +++ /dev/null
|
| @@ -1,99 +0,0 @@
|
| -// Copyright 2013 The Chromium Authors. All rights reserved.
|
| -// Use of this source code is governed by a BSD-style license that can be
|
| -// found in the LICENSE file.
|
| -
|
| -#include "chrome/browser/profiles/profile_loader.h"
|
| -
|
| -#include "base/bind.h"
|
| -#include "base/files/file_path.h"
|
| -#include "base/memory/weak_ptr.h"
|
| -#include "chrome/browser/lifetime/application_lifetime.h"
|
| -#include "chrome/browser/profiles/profile_manager.h"
|
| -
|
| -ProfileLoader::ProfileLoader(ProfileManager* profile_manager)
|
| - : profile_manager_(profile_manager),
|
| - profile_load_sequence_id_(0),
|
| - pending_profile_loads_(0),
|
| - weak_factory_(this) {
|
| -}
|
| -
|
| -ProfileLoader::~ProfileLoader() {
|
| -}
|
| -
|
| -bool ProfileLoader::IsAnyProfileLoading() const {
|
| - return pending_profile_loads_ > 0;
|
| -}
|
| -
|
| -void ProfileLoader::InvalidatePendingProfileLoads() {
|
| - ++profile_load_sequence_id_;
|
| -}
|
| -
|
| -void ProfileLoader::LoadProfileInvalidatingOtherLoads(
|
| - const base::FilePath& profile_file_path,
|
| - base::Callback<void(Profile*)> callback) {
|
| - InvalidatePendingProfileLoads();
|
| -
|
| - Profile* profile = GetProfileByPath(profile_file_path);
|
| - if (profile) {
|
| - callback.Run(profile);
|
| - return;
|
| - }
|
| -
|
| - IncrementPendingProfileLoads();
|
| - CreateProfileAsync(
|
| - profile_file_path,
|
| - base::Bind(&ProfileLoader::OnProfileLoaded,
|
| - weak_factory_.GetWeakPtr(),
|
| - profile_load_sequence_id_,
|
| - callback),
|
| - string16(), string16(), std::string());
|
| -}
|
| -
|
| -Profile* ProfileLoader::GetProfileByPath(const base::FilePath& path) {
|
| - return profile_manager_->GetProfileByPath(path);
|
| -}
|
| -
|
| -void ProfileLoader::CreateProfileAsync(
|
| - const base::FilePath& profile_path,
|
| - const ProfileManager::CreateCallback& callback,
|
| - const string16& name,
|
| - const string16& icon_url,
|
| - const std::string& managed_user_id) {
|
| - profile_manager_->CreateProfileAsync(
|
| - profile_path, callback, name, icon_url, managed_user_id);
|
| -}
|
| -
|
| -void ProfileLoader::OnProfileLoaded(int profile_load_sequence_id,
|
| - base::Callback<void(Profile*)> callback,
|
| - Profile* profile,
|
| - Profile::CreateStatus status) {
|
| - switch (status) {
|
| - case Profile::CREATE_STATUS_CREATED:
|
| - break;
|
| - case Profile::CREATE_STATUS_INITIALIZED:
|
| - if (profile_load_sequence_id == profile_load_sequence_id_)
|
| - callback.Run(profile);
|
| - DecrementPendingProfileLoads();
|
| - break;
|
| - case Profile::CREATE_STATUS_LOCAL_FAIL:
|
| - case Profile::CREATE_STATUS_REMOTE_FAIL:
|
| - case Profile::CREATE_STATUS_CANCELED:
|
| - DecrementPendingProfileLoads();
|
| - break;
|
| - case Profile::MAX_CREATE_STATUS:
|
| - NOTREACHED();
|
| - break;
|
| - }
|
| -}
|
| -
|
| -void ProfileLoader::IncrementPendingProfileLoads() {
|
| - pending_profile_loads_++;
|
| - if (pending_profile_loads_ == 1)
|
| - chrome::StartKeepAlive();
|
| -}
|
| -
|
| -void ProfileLoader::DecrementPendingProfileLoads() {
|
| - pending_profile_loads_--;
|
| - if (pending_profile_loads_ == 0)
|
| - chrome::EndKeepAlive();
|
| -}
|
|
|