| Index: chrome/utility/importer/external_process_importer_bridge.h
|
| diff --git a/chrome/utility/importer/external_process_importer_bridge.h b/chrome/utility/importer/external_process_importer_bridge.h
|
| index 9bf5700e862a493a0c1ba5e283e4cb0e521eded2..57efe3548b509669c5bb4658b875335ad66a7146 100644
|
| --- a/chrome/utility/importer/external_process_importer_bridge.h
|
| +++ b/chrome/utility/importer/external_process_importer_bridge.h
|
| @@ -47,9 +47,8 @@ class ExternalProcessImporterBridge : public ImporterBridge {
|
| base::TaskRunner* task_runner);
|
|
|
| // Begin ImporterBridge implementation:
|
| - virtual void AddBookmarks(
|
| - const std::vector<ImportedBookmarkEntry>& bookmarks,
|
| - const string16& first_folder_name) OVERRIDE;
|
| + virtual void AddBookmarks(const std::vector<ImportedBookmarkEntry>& bookmarks,
|
| + const base::string16& first_folder_name) OVERRIDE;
|
|
|
| virtual void AddHomePage(const GURL& home_page) OVERRIDE;
|
|
|
| @@ -79,7 +78,7 @@ class ExternalProcessImporterBridge : public ImporterBridge {
|
| virtual void NotifyItemEnded(importer::ImportItem item) OVERRIDE;
|
| virtual void NotifyEnded() OVERRIDE;
|
|
|
| - virtual string16 GetLocalizedString(int message_id) OVERRIDE;
|
| + virtual base::string16 GetLocalizedString(int message_id) OVERRIDE;
|
| // End ImporterBridge implementation.
|
|
|
| private:
|
|
|