Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(354)

Unified Diff: chrome/browser/ui/app_list/profile_loader.h

Issue 24707002: Add unit tests for AppListServiceImpl. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: un-const an iterator Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/app_list/keep_alive_service_impl.cc ('k') | chrome/browser/ui/app_list/profile_loader.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..eb3f3385e7a0471461fc6d5d82799ba98ec4cafe 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;
@@ -22,9 +25,11 @@ class ProfileManager;
//
// This is useful for loading profiles in response to user interaction where
// only the latest requested profile is required.
+// TODO(koz): Merge this into AppListServiceImpl.
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 +38,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 +56,4 @@ class ProfileLoader {
DISALLOW_COPY_AND_ASSIGN(ProfileLoader);
};
-#endif // CHROME_BROWSER_PROFILES_PROFILE_LOADER_H_
+#endif // CHROME_BROWSER_UI_APP_LIST_PROFILE_LOADER_H_
« no previous file with comments | « chrome/browser/ui/app_list/keep_alive_service_impl.cc ('k') | chrome/browser/ui/app_list/profile_loader.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698