diff options
29 files changed, 89 insertions, 73 deletions
diff --git a/chrome/browser/automation/automation_provider_observers.h b/chrome/browser/automation/automation_provider_observers.h index 5ecae7b..2742c99 100644 --- a/chrome/browser/automation/automation_provider_observers.h +++ b/chrome/browser/automation/automation_provider_observers.h @@ -33,7 +33,6 @@ #include "chrome/browser/download/all_download_item_notifier.h" #include "chrome/browser/history/history_service.h" #include "chrome/browser/history/history_types.h" -#include "chrome/browser/importer/importer_data_types.h" #include "chrome/browser/importer/importer_progress_observer.h" #include "chrome/browser/memory_details.h" #include "chrome/browser/password_manager/password_store_change.h" @@ -42,6 +41,7 @@ #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/common/automation_constants.h" #include "chrome/common/extensions/extension_constants.h" +#include "chrome/common/importer/importer_data_types.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/download_item.h" #include "content/public/browser/download_manager.h" diff --git a/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc b/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc index 5d3ceef..72bdc9d 100644 --- a/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc +++ b/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc @@ -31,13 +31,13 @@ #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extensions_quota_service.h" #include "chrome/browser/importer/external_process_importer_host.h" -#include "chrome/browser/importer/importer_data_types.h" -#include "chrome/browser/importer/importer_type.h" +#include "chrome/browser/importer/importer_creator.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/chrome_select_file_policy.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/extensions/api/bookmarks.h" +#include "chrome/common/importer/importer_data_types.h" #include "chrome/common/pref_names.h" #include "components/user_prefs/user_prefs.h" #include "content/public/browser/notification_service.h" diff --git a/chrome/browser/first_run/first_run.cc b/chrome/browser/first_run/first_run.cc index 367d018..adfa6b2 100644 --- a/chrome/browser/first_run/first_run.cc +++ b/chrome/browser/first_run/first_run.cc @@ -23,10 +23,10 @@ #include "chrome/browser/first_run/first_run_internal.h" #include "chrome/browser/google/google_util.h" #include "chrome/browser/importer/external_process_importer_host.h" +#include "chrome/browser/importer/importer_creator.h" #include "chrome/browser/importer/importer_host.h" #include "chrome/browser/importer/importer_list.h" #include "chrome/browser/importer/importer_progress_observer.h" -#include "chrome/browser/importer/importer_type.h" #include "chrome/browser/importer/profile_writer.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/search_engines/template_url_service.h" diff --git a/chrome/browser/importer/bookmarks_file_importer.cc b/chrome/browser/importer/bookmarks_file_importer.cc index b0a2548..3a1c871 100644 --- a/chrome/browser/importer/bookmarks_file_importer.cc +++ b/chrome/browser/importer/bookmarks_file_importer.cc @@ -8,9 +8,9 @@ #include "chrome/browser/importer/bookmark_html_reader.h" #include "chrome/browser/importer/firefox_importer_utils.h" #include "chrome/browser/importer/importer_bridge.h" -#include "chrome/browser/importer/importer_data_types.h" #include "chrome/common/importer/imported_bookmark_entry.h" #include "chrome/common/importer/imported_favicon_usage.h" +#include "chrome/common/importer/importer_data_types.h" #include "grit/generated_resources.h" namespace { diff --git a/chrome/browser/importer/external_process_importer_bridge.cc b/chrome/browser/importer/external_process_importer_bridge.cc index 24e9981..23cc3bc 100644 --- a/chrome/browser/importer/external_process_importer_bridge.cc +++ b/chrome/browser/importer/external_process_importer_bridge.cc @@ -10,10 +10,10 @@ #include "base/strings/utf_string_conversions.h" #include "base/task_runner.h" #include "base/values.h" -#include "chrome/browser/importer/importer_data_types.h" -#include "chrome/browser/importer/profile_import_process_messages.h" #include "chrome/common/importer/imported_bookmark_entry.h" #include "chrome/common/importer/imported_favicon_usage.h" +#include "chrome/common/importer/importer_data_types.h" +#include "chrome/common/importer/profile_import_process_messages.h" #include "content/public/common/password_form.h" #include "ipc/ipc_sender.h" diff --git a/chrome/browser/importer/external_process_importer_client.cc b/chrome/browser/importer/external_process_importer_client.cc index 68830fc..7ba65b1 100644 --- a/chrome/browser/importer/external_process_importer_client.cc +++ b/chrome/browser/importer/external_process_importer_client.cc @@ -11,8 +11,8 @@ #include "chrome/browser/importer/firefox_importer_utils.h" #include "chrome/browser/importer/importer_host.h" #include "chrome/browser/importer/in_process_importer_bridge.h" -#include "chrome/browser/importer/profile_import_process_messages.h" #include "chrome/common/importer/imported_bookmark_entry.h" +#include "chrome/common/importer/profile_import_process_messages.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/utility_process_host.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/importer/external_process_importer_client.h b/chrome/browser/importer/external_process_importer_client.h index 6821b23..5af485e 100644 --- a/chrome/browser/importer/external_process_importer_client.h +++ b/chrome/browser/importer/external_process_importer_client.h @@ -13,7 +13,7 @@ #include "base/memory/weak_ptr.h" #include "base/strings/string16.h" #include "chrome/browser/history/history_types.h" -#include "chrome/browser/importer/importer_data_types.h" +#include "chrome/common/importer/importer_data_types.h" #include "chrome/common/importer/importer_url_row.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/utility_process_host_client.h" diff --git a/chrome/browser/importer/external_process_importer_host.cc b/chrome/browser/importer/external_process_importer_host.cc index 1e66b690..65a9a06 100644 --- a/chrome/browser/importer/external_process_importer_host.cc +++ b/chrome/browser/importer/external_process_importer_host.cc @@ -6,7 +6,7 @@ #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/importer/external_process_importer_client.h" -#include "chrome/browser/importer/importer_type.h" +#include "chrome/browser/importer/importer_creator.h" #include "chrome/browser/importer/in_process_importer_bridge.h" ExternalProcessImporterHost::ExternalProcessImporterHost() diff --git a/chrome/browser/importer/firefox_importer_browsertest.cc b/chrome/browser/importer/firefox_importer_browsertest.cc index 11a3c09..837e04d 100644 --- a/chrome/browser/importer/firefox_importer_browsertest.cc +++ b/chrome/browser/importer/firefox_importer_browsertest.cc @@ -13,7 +13,6 @@ #include "base/strings/utf_string_conversions.h" #include "chrome/browser/importer/external_process_importer_host.h" #include "chrome/browser/importer/firefox_importer_unittest_utils.h" -#include "chrome/browser/importer/importer_data_types.h" #include "chrome/browser/importer/importer_host.h" #include "chrome/browser/importer/importer_progress_observer.h" #include "chrome/browser/importer/importer_unittest_utils.h" @@ -22,6 +21,7 @@ #include "chrome/common/chrome_paths.h" #include "chrome/common/importer/imported_bookmark_entry.h" #include "chrome/common/importer/imported_favicon_usage.h" +#include "chrome/common/importer/importer_data_types.h" #include "chrome/test/base/in_process_browser_test.h" #include "content/public/common/password_form.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/importer/ie_importer.cc b/chrome/browser/importer/ie_importer.cc index f60d76f..b5ad754 100644 --- a/chrome/browser/importer/ie_importer.cc +++ b/chrome/browser/importer/ie_importer.cc @@ -32,10 +32,10 @@ #include "chrome/browser/favicon/favicon_util.h" #include "chrome/browser/importer/ie_importer_utils_win.h" #include "chrome/browser/importer/importer_bridge.h" -#include "chrome/browser/importer/importer_data_types.h" #include "chrome/browser/importer/pstore_declarations.h" #include "chrome/common/importer/imported_bookmark_entry.h" #include "chrome/common/importer/imported_favicon_usage.h" +#include "chrome/common/importer/importer_data_types.h" #include "chrome/common/importer/importer_url_row.h" #include "chrome/common/time_format.h" #include "chrome/common/url_constants.h" diff --git a/chrome/browser/importer/ie_importer_browsertest_win.cc b/chrome/browser/importer/ie_importer_browsertest_win.cc index 632beb7..d9dd435 100644 --- a/chrome/browser/importer/ie_importer_browsertest_win.cc +++ b/chrome/browser/importer/ie_importer_browsertest_win.cc @@ -33,7 +33,6 @@ #include "chrome/browser/importer/ie_importer_test_registry_overrider_win.h" #include "chrome/browser/importer/ie_importer_utils_win.h" #include "chrome/browser/importer/importer_bridge.h" -#include "chrome/browser/importer/importer_data_types.h" #include "chrome/browser/importer/importer_host.h" #include "chrome/browser/importer/importer_progress_observer.h" #include "chrome/browser/importer/importer_unittest_utils.h" @@ -43,6 +42,7 @@ #include "chrome/common/chrome_paths.h" #include "chrome/common/importer/imported_bookmark_entry.h" #include "chrome/common/importer/imported_favicon_usage.h" +#include "chrome/common/importer/importer_data_types.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/testing_profile.h" #include "content/public/common/password_form.h" diff --git a/chrome/browser/importer/importer_bridge.h b/chrome/browser/importer/importer_bridge.h index 70cff87..ac9cfd5 100644 --- a/chrome/browser/importer/importer_bridge.h +++ b/chrome/browser/importer/importer_bridge.h @@ -13,7 +13,7 @@ #include "base/strings/string16.h" #include "build/build_config.h" #include "chrome/browser/history/history_types.h" -#include "chrome/browser/importer/importer_data_types.h" +#include "chrome/common/importer/importer_data_types.h" #include "chrome/common/importer/importer_url_row.h" class GURL; diff --git a/chrome/browser/importer/importer_type.cc b/chrome/browser/importer/importer_creator.cc index be12543..7127ed2 100644 --- a/chrome/browser/importer/importer_type.cc +++ b/chrome/browser/importer/importer_creator.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/importer/importer_type.h" +#include "chrome/browser/importer/importer_creator.h" #include "base/logging.h" #include "base/metrics/histogram.h" diff --git a/chrome/browser/importer/importer_creator.h b/chrome/browser/importer/importer_creator.h new file mode 100644 index 0000000..b3b7465 --- /dev/null +++ b/chrome/browser/importer/importer_creator.h @@ -0,0 +1,28 @@ +// Copyright 2013 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef CHROME_BROWSER_IMPORTER_IMPORTER_CREATOR_H_ +#define CHROME_BROWSER_IMPORTER_IMPORTER_CREATOR_H_ + +#include <string> + +#include "chrome/common/importer/importer_type.h" + +class Importer; + +namespace importer { + +// Creates an Importer of the specified |type|. +Importer* CreateImporterByType(ImporterType type); + +// Logs to UMA that an Importer of the specified |type| was used. Uses +// |metric_postfix| to split by entry point. Note: Values passed via +// |metric_postfix| require a matching "Import.ImporterType.|metric_postfix|" +// entry in tools/metrics/histograms/histograms.xml. +void LogImporterUseToMetrics(const std::string& metric_prefix, + ImporterType type); + +} // namespace importer + +#endif // CHROME_BROWSER_IMPORTER_IMPORTER_CREATOR_H_ diff --git a/chrome/browser/importer/importer_host.cc b/chrome/browser/importer/importer_host.cc index 223f266..5914ca63 100644 --- a/chrome/browser/importer/importer_host.cc +++ b/chrome/browser/importer/importer_host.cc @@ -13,9 +13,9 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/importer/firefox_profile_lock.h" #include "chrome/browser/importer/importer.h" +#include "chrome/browser/importer/importer_creator.h" #include "chrome/browser/importer/importer_lock_dialog.h" #include "chrome/browser/importer/importer_progress_observer.h" -#include "chrome/browser/importer/importer_type.h" #include "chrome/browser/importer/in_process_importer_bridge.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/search_engines/template_url.h" diff --git a/chrome/browser/importer/importer_host.h b/chrome/browser/importer/importer_host.h index ce57c98..edbecb4 100644 --- a/chrome/browser/importer/importer_host.h +++ b/chrome/browser/importer/importer_host.h @@ -12,8 +12,8 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/bookmarks/base_bookmark_model_observer.h" -#include "chrome/browser/importer/importer_data_types.h" #include "chrome/browser/importer/profile_writer.h" +#include "chrome/common/importer/importer_data_types.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "ui/gfx/native_widget_types.h" diff --git a/chrome/browser/importer/importer_list.cc b/chrome/browser/importer/importer_list.cc index 173dad4..a43aab6 100644 --- a/chrome/browser/importer/importer_list.cc +++ b/chrome/browser/importer/importer_list.cc @@ -7,9 +7,9 @@ #include "base/bind.h" #include "chrome/browser/importer/firefox_importer_utils.h" #include "chrome/browser/importer/importer_bridge.h" -#include "chrome/browser/importer/importer_data_types.h" #include "chrome/browser/importer/importer_list_observer.h" #include "chrome/browser/shell_integration.h" +#include "chrome/common/importer/importer_data_types.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/importer/importer_progress_observer.h b/chrome/browser/importer/importer_progress_observer.h index 92bca81..b033af8 100644 --- a/chrome/browser/importer/importer_progress_observer.h +++ b/chrome/browser/importer/importer_progress_observer.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_IMPORTER_IMPORTER_PROGRESS_OBSERVER_H_ #define CHROME_BROWSER_IMPORTER_IMPORTER_PROGRESS_OBSERVER_H_ -#include "chrome/browser/importer/importer_data_types.h" +#include "chrome/common/importer/importer_data_types.h" namespace importer { diff --git a/chrome/browser/ui/webui/options/import_data_handler.cc b/chrome/browser/ui/webui/options/import_data_handler.cc index 6a20216..11fac65 100644 --- a/chrome/browser/ui/webui/options/import_data_handler.cc +++ b/chrome/browser/ui/webui/options/import_data_handler.cc @@ -18,8 +18,8 @@ #include "base/values.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/importer/external_process_importer_host.h" +#include "chrome/browser/importer/importer_creator.h" #include "chrome/browser/importer/importer_list.h" -#include "chrome/browser/importer/importer_type.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser_finder.h" #include "content/public/browser/web_ui.h" diff --git a/chrome/browser/ui/webui/options/import_data_handler.h b/chrome/browser/ui/webui/options/import_data_handler.h index d22ff82..aa1d1b0 100644 --- a/chrome/browser/ui/webui/options/import_data_handler.h +++ b/chrome/browser/ui/webui/options/import_data_handler.h @@ -8,10 +8,10 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/memory/ref_counted.h" -#include "chrome/browser/importer/importer_data_types.h" #include "chrome/browser/importer/importer_list_observer.h" #include "chrome/browser/importer/importer_progress_observer.h" #include "chrome/browser/ui/webui/options/options_ui.h" +#include "chrome/common/importer/importer_data_types.h" class ImporterHost; class ImporterList; diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index e15c19a..342a58e 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -263,8 +263,6 @@ 'browser/bookmarks/bookmark_title_match.h', 'browser/bookmarks/bookmark_utils.cc', 'browser/bookmarks/bookmark_utils.h', - 'common/importer/imported_bookmark_entry.cc', - 'common/importer/imported_bookmark_entry.h', 'browser/browser_about_handler.cc', 'browser/browser_about_handler.h', 'browser/browser_process.cc', @@ -561,8 +559,6 @@ 'browser/favicon/favicon_types.h', 'browser/favicon/favicon_util.cc', 'browser/favicon/favicon_util.h', - 'common/importer/imported_favicon_usage.cc', - 'common/importer/imported_favicon_usage.h', 'browser/file_select_helper.cc', 'browser/file_select_helper.h', 'browser/first_run/first_run.cc', @@ -860,8 +856,8 @@ 'browser/importer/importer.h', 'browser/importer/importer_bridge.cc', 'browser/importer/importer_bridge.h', - 'browser/importer/importer_data_types.cc', - 'browser/importer/importer_data_types.h', + 'browser/importer/importer_creator.cc', + 'browser/importer/importer_creator.h', 'browser/importer/importer_host.cc', 'browser/importer/importer_host.h', 'browser/importer/importer_list.cc', @@ -869,8 +865,6 @@ 'browser/importer/importer_list_observer.h', 'browser/importer/importer_lock_dialog.h', 'browser/importer/importer_progress_observer.h', - 'browser/importer/importer_type.cc', - 'browser/importer/importer_type.h', 'browser/importer/in_process_importer_bridge.cc', 'browser/importer/in_process_importer_bridge.h', 'browser/importer/nss_decryptor.cc', @@ -881,8 +875,6 @@ 'browser/importer/nss_decryptor_system_nss.h', 'browser/importer/nss_decryptor_win.cc', 'browser/importer/nss_decryptor_win.h', - 'browser/importer/profile_import_process_messages.cc', - 'browser/importer/profile_import_process_messages.h', 'browser/importer/profile_writer.cc', 'browser/importer/profile_writer.h', 'browser/importer/safari_importer.h', diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi index 534aadc..2082620 100644 --- a/chrome/chrome_common.gypi +++ b/chrome/chrome_common.gypi @@ -325,12 +325,21 @@ 'common/extensions/value_counter.h', 'common/extensions/web_accessible_resources_handler.cc', 'common/extensions/web_accessible_resources_handler.h', - 'common/external_ipc_fuzzer.h', 'common/external_ipc_fuzzer.cc', + 'common/external_ipc_fuzzer.h', 'common/icon_with_badge_image_source.cc', 'common/icon_with_badge_image_source.h', + 'common/importer/imported_bookmark_entry.cc', + 'common/importer/imported_bookmark_entry.h', + 'common/importer/imported_favicon_usage.cc', + 'common/importer/imported_favicon_usage.h', + 'common/importer/importer_data_types.cc', + 'common/importer/importer_data_types.h', + 'common/importer/importer_type.h', 'common/importer/importer_url_row.cc', 'common/importer/importer_url_row.h', + 'common/importer/profile_import_process_messages.cc', + 'common/importer/profile_import_process_messages.h', 'common/instant_restricted_id_cache.h', 'common/instant_types.cc', 'common/instant_types.h', diff --git a/chrome/common/all_messages.h b/chrome/common/all_messages.h index 6e3eb1e..fb1438e 100644 --- a/chrome/common/all_messages.h +++ b/chrome/common/all_messages.h @@ -10,7 +10,7 @@ // should not be listed here and instead get an exemption in // chrome/tools/ipclist/ipclist.cc. #if !defined(OS_ANDROID) -#include "chrome/browser/importer/profile_import_process_messages.h" +#include "chrome/common/importer/profile_import_process_messages.h" #endif #if defined(ENABLE_AUTOMATION) diff --git a/chrome/browser/importer/importer_data_types.cc b/chrome/common/importer/importer_data_types.cc index a178fc2..392b13d 100644 --- a/chrome/browser/importer/importer_data_types.cc +++ b/chrome/common/importer/importer_data_types.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/importer/importer_data_types.h" +#include "chrome/common/importer/importer_data_types.h" namespace importer { diff --git a/chrome/browser/importer/importer_data_types.h b/chrome/common/importer/importer_data_types.h index eae32a8..e4c027e 100644 --- a/chrome/browser/importer/importer_data_types.h +++ b/chrome/common/importer/importer_data_types.h @@ -1,9 +1,9 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_IMPORTER_IMPORTER_DATA_TYPES_H_ -#define CHROME_BROWSER_IMPORTER_IMPORTER_DATA_TYPES_H_ +#ifndef CHROME_COMMON_IMPORTER_IMPORTER_DATA_TYPES_H_ +#define CHROME_COMMON_IMPORTER_IMPORTER_DATA_TYPES_H_ #include <string> @@ -11,7 +11,7 @@ #include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/strings/string16.h" -#include "chrome/browser/importer/importer_type.h" +#include "chrome/common/importer/importer_type.h" #include "url/gurl.h" // Types needed for importing data from other browsers and the Google Toolbar. @@ -53,4 +53,4 @@ struct URLKeywordInfo { } // namespace importer -#endif // CHROME_BROWSER_IMPORTER_IMPORTER_DATA_TYPES_H_ +#endif // CHROME_COMMON_IMPORTER_IMPORTER_DATA_TYPES_H_ diff --git a/chrome/browser/importer/importer_type.h b/chrome/common/importer/importer_type.h index 280bad0..7b301af 100644 --- a/chrome/browser/importer/importer_type.h +++ b/chrome/common/importer/importer_type.h @@ -1,16 +1,12 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_IMPORTER_IMPORTER_TYPE_H_ -#define CHROME_BROWSER_IMPORTER_IMPORTER_TYPE_H_ - -#include <string> +#ifndef CHROME_COMMON_IMPORTER_IMPORTER_TYPE_H_ +#define CHROME_COMMON_IMPORTER_IMPORTER_TYPE_H_ #include "build/build_config.h" -class Importer; - namespace importer { // An enumeration of the type of importers that we support to import @@ -31,16 +27,7 @@ enum ImporterType { TYPE_BOOKMARKS_FILE = 5 // Identifies a 'bookmarks.html' file. }; -// Creates an Importer of the specified |type|. -Importer* CreateImporterByType(ImporterType type); - -// Logs to UMA that an Importer of the specified |type| was used. Uses -// |metric_postfix| to split by entry point. Note: Values passed via -// |metric_postfix| require a matching "Import.ImporterType.|metric_postfix|" -// entry in tools/metrics/histograms/histograms.xml. -void LogImporterUseToMetrics(const std::string& metric_prefix, - ImporterType type); - } // namespace importer -#endif // CHROME_BROWSER_IMPORTER_IMPORTER_TYPE_H_ + +#endif // CHROME_COMMON_IMPORTER_IMPORTER_TYPE_H_ diff --git a/chrome/browser/importer/profile_import_process_messages.cc b/chrome/common/importer/profile_import_process_messages.cc index 68603e4..4a0b9a4 100644 --- a/chrome/browser/importer/profile_import_process_messages.cc +++ b/chrome/common/importer/profile_import_process_messages.cc @@ -1,33 +1,33 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. // Get basic type definitions. #define IPC_MESSAGE_IMPL -#include "chrome/browser/importer/profile_import_process_messages.h" +#include "chrome/common/importer/profile_import_process_messages.h" // Generate constructors. #include "ipc/struct_constructor_macros.h" -#include "chrome/browser/importer/profile_import_process_messages.h" +#include "chrome/common/importer/profile_import_process_messages.h" // Generate destructors. #include "ipc/struct_destructor_macros.h" -#include "chrome/browser/importer/profile_import_process_messages.h" +#include "chrome/common/importer/profile_import_process_messages.h" // Generate param traits write methods. #include "ipc/param_traits_write_macros.h" namespace IPC { -#include "chrome/browser/importer/profile_import_process_messages.h" +#include "chrome/common/importer/profile_import_process_messages.h" } // namespace IPC // Generate param traits read methods. #include "ipc/param_traits_read_macros.h" namespace IPC { -#include "chrome/browser/importer/profile_import_process_messages.h" +#include "chrome/common/importer/profile_import_process_messages.h" } // namespace IPC // Generate param traits log methods. #include "ipc/param_traits_log_macros.h" namespace IPC { -#include "chrome/browser/importer/profile_import_process_messages.h" +#include "chrome/common/importer/profile_import_process_messages.h" } // namespace IPC diff --git a/chrome/browser/importer/profile_import_process_messages.h b/chrome/common/importer/profile_import_process_messages.h index d62cc99..8641f7c 100644 --- a/chrome/browser/importer/profile_import_process_messages.h +++ b/chrome/common/importer/profile_import_process_messages.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -9,19 +9,18 @@ #include "base/basictypes.h" #include "base/strings/string16.h" #include "base/values.h" -#include "chrome/browser/importer/importer_data_types.h" -#include "chrome/browser/search_engines/template_url.h" #include "chrome/common/common_param_traits_macros.h" #include "chrome/common/importer/imported_bookmark_entry.h" #include "chrome/common/importer/imported_favicon_usage.h" +#include "chrome/common/importer/importer_data_types.h" #include "chrome/common/importer/importer_url_row.h" #include "content/public/common/common_param_traits.h" #include "content/public/common/password_form.h" #include "ipc/ipc_message_macros.h" #include "ipc/ipc_message_utils.h" -#ifndef CHROME_BROWSER_IMPORTER_PROFILE_IMPORT_PROCESS_MESSAGES_H_ -#define CHROME_BROWSER_IMPORTER_PROFILE_IMPORT_PROCESS_MESSAGES_H_ +#ifndef CHROME_COMMON_IMPORTER_PROFILE_IMPORT_PROCESS_MESSAGES_H_ +#define CHROME_COMMON_IMPORTER_PROFILE_IMPORT_PROCESS_MESSAGES_H_ namespace IPC { @@ -222,7 +221,7 @@ struct ParamTraits<importer::URLKeywordInfo> { } // namespace IPC -#endif // CHROME_BROWSER_IMPORTER_PROFILE_IMPORT_PROCESS_MESSAGES_H_ +#endif // CHROME_COMMON_IMPORTER_PROFILE_IMPORT_PROCESS_MESSAGES_H_ #define IPC_MESSAGE_START ProfileImportMsgStart diff --git a/chrome/utility/profile_import_handler.cc b/chrome/utility/profile_import_handler.cc index 79cf0be..99ab420 100644 --- a/chrome/utility/profile_import_handler.cc +++ b/chrome/utility/profile_import_handler.cc @@ -10,7 +10,8 @@ #include "base/threading/thread.h" #include "chrome/browser/importer/external_process_importer_bridge.h" #include "chrome/browser/importer/importer.h" -#include "chrome/browser/importer/profile_import_process_messages.h" +#include "chrome/browser/importer/importer_creator.h" +#include "chrome/common/importer/profile_import_process_messages.h" #include "content/public/utility/utility_thread.h" namespace chrome { |