| Index: chrome/browser/importer/importer_list.h
|
| diff --git a/chrome/browser/importer/importer_list.h b/chrome/browser/importer/importer_list.h
|
| index 03ba8be3a116cb6967eaaa2d2f3cb3f3e873a955..2a5e4d9ca835306d155d6628b9a91024bcc7c707 100644
|
| --- a/chrome/browser/importer/importer_list.h
|
| +++ b/chrome/browser/importer/importer_list.h
|
| @@ -10,13 +10,9 @@
|
|
|
| #include "base/basictypes.h"
|
| #include "base/callback_forward.h"
|
| -#include "base/memory/scoped_vector.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "base/strings/string16.h"
|
| -
|
| -namespace importer {
|
| -struct SourceProfile;
|
| -}
|
| +#include "chrome/common/importer/importer_data_types.h"
|
|
|
| // ImporterList detects installed browsers and profiles via
|
| // DetectSourceProfilesWorker(). ImporterList lives on the UI thread.
|
| @@ -47,14 +43,14 @@ class ImporterList {
|
| const importer::SourceProfile& GetSourceProfileAt(size_t index) const;
|
|
|
| private:
|
| - // Called when the source profiles are loaded. Takes ownership of the
|
| - // loaded profiles in |profiles| and calls |profiles_loaded_callback|.
|
| + // Called when the source profiles are loaded. Copies the loaded profiles
|
| + // in |profiles| and calls |profiles_loaded_callback|.
|
| void SourceProfilesLoaded(
|
| const base::Closure& profiles_loaded_callback,
|
| - const std::vector<importer::SourceProfile*>& profiles);
|
| + const std::vector<importer::SourceProfile>& profiles);
|
|
|
| // The list of profiles with the default one first.
|
| - ScopedVector<importer::SourceProfile> source_profiles_;
|
| + std::vector<importer::SourceProfile> source_profiles_;
|
|
|
| base::WeakPtrFactory<ImporterList> weak_ptr_factory_;
|
|
|
|
|