Index: chrome/browser/importer/external_process_importer_client.h |
=================================================================== |
--- chrome/browser/importer/external_process_importer_client.h (revision 208948) |
+++ chrome/browser/importer/external_process_importer_client.h (working copy) |
@@ -21,13 +21,16 @@ |
struct ImportedBookmarkEntry; |
struct ImportedFaviconUsage; |
class InProcessImporterBridge; |
-class TemplateURL; |
namespace content { |
struct PasswordForm; |
class UtilityProcessHost; |
} |
+namespace importer { |
+struct URLKeywordInfo; |
+} |
+ |
// This class is the client for the out of process profile importing. It |
// collects notifications from this process host and feeds data back to the |
// importer host, who actually does the writing. |
@@ -65,10 +68,11 @@ |
void OnFaviconsImportGroup( |
const std::vector<ImportedFaviconUsage>& favicons_group); |
void OnPasswordFormImportReady(const content::PasswordForm& form); |
- // WARNING: This function takes ownership of (and deletes) the pointers in |
- // |template_urls|! |
- void OnKeywordsImportReady(const std::vector<TemplateURL*>& template_urls, |
- bool unique_on_host_and_path); |
+ void OnKeywordsImportReady( |
+ const std::vector<importer::URLKeywordInfo>& url_keywords, |
+ bool unique_on_host_and_path); |
+ void OnFirefoxSearchEngineDataReceived( |
+ const std::vector<std::string> search_engine_data); |
protected: |
virtual ~ExternalProcessImporterClient(); |