| Index: chrome/browser/ui/app_list/profile_loader.h
|
| diff --git a/chrome/browser/ui/app_list/profile_loader.h b/chrome/browser/ui/app_list/profile_loader.h
|
| index 724ea825bd7b0d63605e3b024fe36b8e5b351400..c9a07f2e871b6220a064364de9bae8b9482d00af 100644
|
| --- a/chrome/browser/ui/app_list/profile_loader.h
|
| +++ b/chrome/browser/ui/app_list/profile_loader.h
|
| @@ -12,10 +12,13 @@ namespace base {
|
| class FilePath;
|
| }
|
|
|
| +namespace browser_lifetime {
|
| +class ScopedKeepAlive;
|
| +}
|
| +
|
| class Profile;
|
| class ProfileLoaderUnittest;
|
| class ProfileStore;
|
| -class ScopedKeepAlive;
|
|
|
| // This class loads profiles asynchronously and calls the provided callback once
|
| // the profile is ready. Only the callback for the most recent load request is
|
| @@ -46,7 +49,7 @@ class ProfileLoader {
|
| void DecrementPendingProfileLoads();
|
|
|
| ProfileStore* profile_store_;
|
| - scoped_ptr<ScopedKeepAlive> keep_alive_;
|
| + scoped_ptr<browser_lifetime::ScopedKeepAlive> keep_alive_;
|
| int profile_load_sequence_id_;
|
| int pending_profile_loads_;
|
|
|
|
|