| Index: chrome/browser/ui/app_list/profile_loader.h
|
| diff --git a/chrome/browser/profiles/profile_loader.h b/chrome/browser/ui/app_list/profile_loader.h
|
| similarity index 64%
|
| rename from chrome/browser/profiles/profile_loader.h
|
| rename to chrome/browser/ui/app_list/profile_loader.h
|
| index 72d9f1738af31fbc06b8e076c770ff898b501ea9..4f147f76c92bc98ac1d4be8eea54bacd5f1b2774 100644
|
| --- a/chrome/browser/profiles/profile_loader.h
|
| +++ b/chrome/browser/ui/app_list/profile_loader.h
|
| @@ -2,13 +2,16 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef CHROME_BROWSER_PROFILES_PROFILE_LOADER_H_
|
| -#define CHROME_BROWSER_PROFILES_PROFILE_LOADER_H_
|
| +#ifndef CHROME_BROWSER_UI_APP_LIST_PROFILE_LOADER_H_
|
| +#define CHROME_BROWSER_UI_APP_LIST_PROFILE_LOADER_H_
|
|
|
| #include "base/callback.h"
|
| +#include "base/memory/scoped_ptr.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| #include "chrome/browser/profiles/profile_manager.h"
|
| +#include "chrome/browser/ui/app_list/keep_alive_service.h"
|
| +#include "chrome/browser/ui/app_list/profile_store.h"
|
|
|
| namespace base {
|
| class FilePath;
|
| @@ -24,7 +27,8 @@ class ProfileManager;
|
| // only the latest requested profile is required.
|
| class ProfileLoader {
|
| public:
|
| - explicit ProfileLoader(ProfileManager* profile_manager);
|
| + explicit ProfileLoader(ProfileStore* profile_store,
|
| + scoped_ptr<KeepAliveService> keep_alive_service);
|
| ~ProfileLoader();
|
|
|
| bool IsAnyProfileLoading() const;
|
| @@ -33,27 +37,16 @@ class ProfileLoader {
|
| const base::FilePath& profile_file_path,
|
| base::Callback<void(Profile*)> callback);
|
|
|
| - protected:
|
| - // These just call through to the ProfileManager.
|
| - // Virtual so they can be mocked out in tests.
|
| - virtual Profile* GetProfileByPath(const base::FilePath& path);
|
| - virtual void CreateProfileAsync(
|
| - const base::FilePath& profile_path,
|
| - const ProfileManager::CreateCallback& callback,
|
| - const string16& name,
|
| - const string16& icon_url,
|
| - const std::string& managed_user_id);
|
| -
|
| private:
|
| void OnProfileLoaded(int profile_load_sequence_id,
|
| base::Callback<void(Profile*)> callback,
|
| - Profile* profile,
|
| - Profile::CreateStatus status);
|
| + Profile* profile);
|
|
|
| void IncrementPendingProfileLoads();
|
| void DecrementPendingProfileLoads();
|
|
|
| - ProfileManager* profile_manager_;
|
| + ProfileStore* profile_store_;
|
| + scoped_ptr<KeepAliveService> keep_alive_service_;
|
| int profile_load_sequence_id_;
|
| int pending_profile_loads_;
|
|
|
| @@ -62,4 +55,4 @@ class ProfileLoader {
|
| DISALLOW_COPY_AND_ASSIGN(ProfileLoader);
|
| };
|
|
|
| -#endif // CHROME_BROWSER_PROFILES_PROFILE_LOADER_H_
|
| +#endif // CHROME_BROWSER_UI_APP_LIST_PROFILE_LOADER_H_
|
|
|