| Index: chrome/utility/chrome_content_utility_client.h
|
| diff --git a/chrome/utility/chrome_content_utility_client.h b/chrome/utility/chrome_content_utility_client.h
|
| index b028636d057416f6fd754b5aceb12048eedd0636..b4e06c4c9c29f4228cf48119677050ac253e4903 100644
|
| --- a/chrome/utility/chrome_content_utility_client.h
|
| +++ b/chrome/utility/chrome_content_utility_client.h
|
| @@ -6,7 +6,6 @@
|
| #define CHROME_UTILITY_CHROME_CONTENT_UTILITY_CLIENT_H_
|
|
|
| #include "base/compiler_specific.h"
|
| -#include "base/memory/ref_counted.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/platform_file.h"
|
| #include "content/public/utility/content_utility_client.h"
|
| @@ -77,29 +76,8 @@ class ChromeContentUtilityClient : public content::ContentUtilityClient {
|
|
|
| void OnGetPrinterCapsAndDefaults(const std::string& printer_name);
|
|
|
| - void OnImportStart(
|
| - const importer::SourceProfile& source_profile,
|
| - uint16 items,
|
| - const base::DictionaryValue& localized_strings);
|
| - void OnImportCancel();
|
| - void OnImportItemFinished(uint16 item);
|
| -
|
| - // The following are used with out of process profile import:
|
| - void ImporterCleanup();
|
| -
|
| - // Thread that importer runs on, while ProfileImportThread handles messages
|
| - // from the browser process.
|
| - scoped_ptr<base::Thread> import_thread_;
|
| -
|
| - // Bridge object is passed to importer, so that it can send IPC calls
|
| - // directly back to the ProfileImportProcessHost.
|
| - scoped_refptr<ExternalProcessImporterBridge> bridge_;
|
| -
|
| - // A bitmask of importer::ImportItem.
|
| - uint16 items_to_import_;
|
| -
|
| - // Importer of the appropriate type (Firefox, Safari, IE, etc.)
|
| - scoped_refptr<Importer> importer_;
|
| + class ImportHandler;
|
| + scoped_ptr<ImportHandler> import_handler_;
|
| };
|
|
|
| } // namespace chrome
|
|
|