| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef CHROME_BROWSER_IMPORTER_EXTERNAL_PROCESS_IMPORTER_BRIDGE_H_ | 5 #ifndef CHROME_UTILITY_IMPORTER_EXTERNAL_PROCESS_IMPORTER_BRIDGE_H_ |
| 6 #define CHROME_BROWSER_IMPORTER_EXTERNAL_PROCESS_IMPORTER_BRIDGE_H_ | 6 #define CHROME_UTILITY_IMPORTER_EXTERNAL_PROCESS_IMPORTER_BRIDGE_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| 11 #include "base/basictypes.h" | 11 #include "base/basictypes.h" |
| 12 #include "base/compiler_specific.h" | 12 #include "base/compiler_specific.h" |
| 13 #include "base/memory/scoped_ptr.h" | 13 #include "base/memory/scoped_ptr.h" |
| 14 #include "chrome/browser/importer/importer_bridge.h" | 14 #include "chrome/common/importer/importer_bridge.h" |
| 15 #include "chrome/common/importer/importer_visit_source.h" |
| 15 | 16 |
| 16 class GURL; | 17 class GURL; |
| 17 struct ImportedBookmarkEntry; | 18 struct ImportedBookmarkEntry; |
| 18 | 19 |
| 19 namespace base { | 20 namespace base { |
| 20 class DictionaryValue; | 21 class DictionaryValue; |
| 21 class TaskRunner; | 22 class TaskRunner; |
| 22 } | 23 } |
| 23 | 24 |
| 24 namespace importer { | 25 namespace importer { |
| (...skipping 30 matching lines...) Expand all Loading... |
| 55 | 56 |
| 56 #if defined(OS_WIN) | 57 #if defined(OS_WIN) |
| 57 virtual void AddIE7PasswordInfo( | 58 virtual void AddIE7PasswordInfo( |
| 58 const importer::ImporterIE7PasswordInfo& password_info) OVERRIDE; | 59 const importer::ImporterIE7PasswordInfo& password_info) OVERRIDE; |
| 59 #endif | 60 #endif |
| 60 | 61 |
| 61 virtual void SetFavicons( | 62 virtual void SetFavicons( |
| 62 const std::vector<ImportedFaviconUsage>& favicons) OVERRIDE; | 63 const std::vector<ImportedFaviconUsage>& favicons) OVERRIDE; |
| 63 | 64 |
| 64 virtual void SetHistoryItems(const std::vector<ImporterURLRow>& rows, | 65 virtual void SetHistoryItems(const std::vector<ImporterURLRow>& rows, |
| 65 history::VisitSource visit_source) OVERRIDE; | 66 ImporterVisitSource visit_source) OVERRIDE; |
| 66 | 67 |
| 67 virtual void SetKeywords( | 68 virtual void SetKeywords( |
| 68 const std::vector<importer::URLKeywordInfo>& url_keywords, | 69 const std::vector<importer::URLKeywordInfo>& url_keywords, |
| 69 bool unique_on_host_and_path) OVERRIDE; | 70 bool unique_on_host_and_path) OVERRIDE; |
| 70 | 71 |
| 71 virtual void SetFirefoxSearchEnginesXMLData( | 72 virtual void SetFirefoxSearchEnginesXMLData( |
| 72 const std::vector<std::string>& seach_engine_data) OVERRIDE; | 73 const std::vector<std::string>& seach_engine_data) OVERRIDE; |
| 73 | 74 |
| 74 virtual void SetPasswordForm( | 75 virtual void SetPasswordForm( |
| 75 const content::PasswordForm& form) OVERRIDE; | 76 const content::PasswordForm& form) OVERRIDE; |
| (...skipping 15 matching lines...) Expand all Loading... |
| 91 // Holds strings needed by the external importer because the resource | 92 // Holds strings needed by the external importer because the resource |
| 92 // bundle isn't available to the external process. | 93 // bundle isn't available to the external process. |
| 93 scoped_ptr<base::DictionaryValue> localized_strings_; | 94 scoped_ptr<base::DictionaryValue> localized_strings_; |
| 94 | 95 |
| 95 IPC::Sender* sender_; | 96 IPC::Sender* sender_; |
| 96 scoped_refptr<base::TaskRunner> task_runner_; | 97 scoped_refptr<base::TaskRunner> task_runner_; |
| 97 | 98 |
| 98 DISALLOW_COPY_AND_ASSIGN(ExternalProcessImporterBridge); | 99 DISALLOW_COPY_AND_ASSIGN(ExternalProcessImporterBridge); |
| 99 }; | 100 }; |
| 100 | 101 |
| 101 #endif // CHROME_BROWSER_IMPORTER_EXTERNAL_PROCESS_IMPORTER_BRIDGE_H_ | 102 #endif // CHROME_UTILITY_IMPORTER_EXTERNAL_PROCESS_IMPORTER_BRIDGE_H_ |
| OLD | NEW |