diff options
Diffstat (limited to 'chrome/browser/download')
14 files changed, 17 insertions, 17 deletions
diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrome/browser/download/chrome_download_manager_delegate.cc index 165443a..94fb0b8 100644 --- a/chrome/browser/download/chrome_download_manager_delegate.cc +++ b/chrome/browser/download/chrome_download_manager_delegate.cc @@ -11,8 +11,6 @@ #include "base/callback.h" #include "base/files/file_util.h" #include "base/macros.h" -#include "base/prefs/pref_member.h" -#include "base/prefs/pref_service.h" #include "base/rand_util.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" @@ -45,6 +43,8 @@ #include "chrome/common/features.h" #include "chrome/common/pref_names.h" #include "components/pref_registry/pref_registry_syncable.h" +#include "components/prefs/pref_member.h" +#include "components/prefs/pref_service.h" #include "content/public/browser/download_item.h" #include "content/public/browser/download_manager.h" #include "content/public/browser/notification_source.h" diff --git a/chrome/browser/download/chrome_download_manager_delegate_unittest.cc b/chrome/browser/download/chrome_download_manager_delegate_unittest.cc index c778b8e..505c56b 100644 --- a/chrome/browser/download/chrome_download_manager_delegate_unittest.cc +++ b/chrome/browser/download/chrome_download_manager_delegate_unittest.cc @@ -10,7 +10,6 @@ #include "base/files/scoped_temp_dir.h" #include "base/location.h" #include "base/message_loop/message_loop.h" -#include "base/prefs/pref_service.h" #include "base/run_loop.h" #include "base/single_thread_task_runner.h" #include "base/thread_task_runner_handle.h" @@ -21,6 +20,7 @@ #include "chrome/common/pref_names.h" #include "chrome/test/base/chrome_render_view_host_test_harness.h" #include "chrome/test/base/testing_profile.h" +#include "components/prefs/pref_service.h" #include "components/syncable_prefs/testing_pref_service_syncable.h" #include "content/public/browser/download_interrupt_reasons.h" #include "content/public/browser/web_contents.h" diff --git a/chrome/browser/download/download_browsertest.cc b/chrome/browser/download/download_browsertest.cc index 061b69b..5fdcbf4 100644 --- a/chrome/browser/download/download_browsertest.cc +++ b/chrome/browser/download/download_browsertest.cc @@ -19,7 +19,6 @@ #include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/path_service.h" -#include "base/prefs/pref_service.h" #include "base/stl_util.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" @@ -75,6 +74,7 @@ #include "components/history/core/browser/history_service.h" #include "components/infobars/core/confirm_infobar_delegate.h" #include "components/infobars/core/infobar.h" +#include "components/prefs/pref_service.h" #include "content/public/browser/download_interrupt_reasons.h" #include "content/public/browser/download_item.h" #include "content/public/browser/download_manager.h" diff --git a/chrome/browser/download/download_dir_policy_handler.cc b/chrome/browser/download/download_dir_policy_handler.cc index 1a98cdc..680f619 100644 --- a/chrome/browser/download/download_dir_policy_handler.cc +++ b/chrome/browser/download/download_dir_policy_handler.cc @@ -8,7 +8,6 @@ #include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" -#include "base/prefs/pref_value_map.h" #include "base/values.h" #include "build/build_config.h" #include "chrome/browser/download/download_prefs.h" @@ -19,6 +18,7 @@ #include "components/policy/core/browser/policy_error_map.h" #include "components/policy/core/common/policy_map.h" #include "components/policy/core/common/policy_types.h" +#include "components/prefs/pref_value_map.h" #include "grit/components_strings.h" #include "policy/policy_constants.h" diff --git a/chrome/browser/download/download_prefs.cc b/chrome/browser/download/download_prefs.cc index 6f2daef..c27970c 100644 --- a/chrome/browser/download/download_prefs.cc +++ b/chrome/browser/download/download_prefs.cc @@ -16,7 +16,6 @@ #include "base/logging.h" #include "base/macros.h" #include "base/path_service.h" -#include "base/prefs/pref_service.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" #include "base/strings/sys_string_conversions.h" @@ -32,6 +31,7 @@ #include "chrome/common/chrome_paths.h" #include "chrome/common/pref_names.h" #include "components/pref_registry/pref_registry_syncable.h" +#include "components/prefs/pref_service.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/download_manager.h" #include "content/public/browser/save_page_type.h" diff --git a/chrome/browser/download/download_prefs.h b/chrome/browser/download/download_prefs.h index 4b1eac3..29608ba 100644 --- a/chrome/browser/download/download_prefs.h +++ b/chrome/browser/download/download_prefs.h @@ -9,8 +9,8 @@ #include "base/files/file_path.h" #include "base/macros.h" -#include "base/prefs/pref_member.h" #include "build/build_config.h" +#include "components/prefs/pref_member.h" class PrefService; class Profile; diff --git a/chrome/browser/download/download_prefs_unittest.cc b/chrome/browser/download/download_prefs_unittest.cc index 8867414..a6899fd 100644 --- a/chrome/browser/download/download_prefs_unittest.cc +++ b/chrome/browser/download/download_prefs_unittest.cc @@ -5,10 +5,10 @@ #include "chrome/browser/download/download_prefs.h" #include "base/files/file_path.h" -#include "base/prefs/pref_service.h" #include "chrome/browser/download/download_extensions.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_profile.h" +#include "components/prefs/pref_service.h" #include "content/public/test/test_browser_thread_bundle.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/download/download_query.cc b/chrome/browser/download/download_query.cc index a1819f3..f562ad8 100644 --- a/chrome/browser/download/download_query.cc +++ b/chrome/browser/download/download_query.cc @@ -18,7 +18,6 @@ #include "base/i18n/string_search.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" -#include "base/prefs/pref_service.h" #include "base/stl_util.h" #include "base/strings/string16.h" #include "base/strings/string_split.h" @@ -28,6 +27,7 @@ #include "base/values.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/pref_names.h" +#include "components/prefs/pref_service.h" #include "components/url_formatter/url_formatter.h" #include "content/public/browser/content_browser_client.h" #include "content/public/browser/download_item.h" diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/browser/download/download_target_determiner.cc index 1740322..26f3d88 100644 --- a/chrome/browser/download/download_target_determiner.cc +++ b/chrome/browser/download/download_target_determiner.cc @@ -5,7 +5,6 @@ #include "chrome/browser/download/download_target_determiner.h" #include "base/location.h" -#include "base/prefs/pref_service.h" #include "base/rand_util.h" #include "base/single_thread_task_runner.h" #include "base/strings/stringprintf.h" @@ -22,6 +21,7 @@ #include "chrome/grit/generated_resources.h" #include "components/history/core/browser/history_service.h" #include "components/mime_util/mime_util.h" +#include "components/prefs/pref_service.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/download_interrupt_reasons.h" diff --git a/chrome/browser/download/download_target_determiner_unittest.cc b/chrome/browser/download/download_target_determiner_unittest.cc index 681a264..03898eb 100644 --- a/chrome/browser/download/download_target_determiner_unittest.cc +++ b/chrome/browser/download/download_target_determiner_unittest.cc @@ -11,7 +11,6 @@ #include "base/location.h" #include "base/macros.h" #include "base/observer_list.h" -#include "base/prefs/pref_service.h" #include "base/run_loop.h" #include "base/single_thread_task_runner.h" #include "base/stl_util.h" @@ -30,6 +29,7 @@ #include "chrome/test/base/testing_profile.h" #include "components/history/core/browser/history_service.h" #include "components/history/core/browser/history_types.h" +#include "components/prefs/pref_service.h" #include "components/syncable_prefs/testing_pref_service_syncable.h" #include "content/public/browser/download_interrupt_reasons.h" #include "content/public/browser/render_process_host.h" diff --git a/chrome/browser/download/notification/download_item_notification.cc b/chrome/browser/download/notification/download_item_notification.cc index 4c48127..248698291 100644 --- a/chrome/browser/download/notification/download_item_notification.cc +++ b/chrome/browser/download/notification/download_item_notification.cc @@ -8,7 +8,6 @@ #include <stdint.h> #include "base/files/file_util.h" -#include "base/prefs/pref_service.h" #include "base/strings/utf_string_conversions.h" #include "build/build_config.h" #include "chrome/browser/browser_process.h" @@ -24,6 +23,7 @@ #include "chrome/grit/chromium_strings.h" #include "chrome/grit/generated_resources.h" #include "components/mime_util/mime_util.h" +#include "components/prefs/pref_service.h" #include "components/url_formatter/elide_url.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/browser_thread.h" diff --git a/chrome/browser/download/notification/download_notification_browsertest.cc b/chrome/browser/download/notification/download_notification_browsertest.cc index ea910c5..98f81ea 100644 --- a/chrome/browser/download/notification/download_notification_browsertest.cc +++ b/chrome/browser/download/notification/download_notification_browsertest.cc @@ -9,7 +9,6 @@ #include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/path_service.h" -#include "base/prefs/pref_service.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/chromeos/profiles/profile_helper.h" @@ -29,6 +28,7 @@ #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" #include "chromeos/chromeos_switches.h" +#include "components/prefs/pref_service.h" #include "components/signin/core/browser/signin_manager_base.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/download_item.h" diff --git a/chrome/browser/download/save_package_file_picker.cc b/chrome/browser/download/save_package_file_picker.cc index d6486c9..1e47e0e 100644 --- a/chrome/browser/download/save_package_file_picker.cc +++ b/chrome/browser/download/save_package_file_picker.cc @@ -10,8 +10,6 @@ #include "base/command_line.h" #include "base/i18n/file_util_icu.h" #include "base/metrics/histogram.h" -#include "base/prefs/pref_member.h" -#include "base/prefs/pref_service.h" #include "base/strings/utf_string_conversions.h" #include "build/build_config.h" #include "chrome/browser/download/chrome_download_manager_delegate.h" @@ -21,6 +19,8 @@ #include "chrome/browser/ui/chrome_select_file_policy.h" #include "chrome/common/chrome_switches.h" #include "chrome/grit/generated_resources.h" +#include "components/prefs/pref_member.h" +#include "components/prefs/pref_service.h" #include "content/public/browser/download_manager.h" #include "content/public/browser/render_process_host.h" #include "content/public/browser/save_page_type.h" diff --git a/chrome/browser/download/save_page_browsertest.cc b/chrome/browser/download/save_page_browsertest.cc index 8518f63..6ee552f 100644 --- a/chrome/browser/download/save_page_browsertest.cc +++ b/chrome/browser/download/save_page_browsertest.cc @@ -16,8 +16,6 @@ #include "base/files/scoped_temp_dir.h" #include "base/macros.h" #include "base/path_service.h" -#include "base/prefs/pref_member.h" -#include "base/prefs/pref_service.h" #include "base/run_loop.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" @@ -44,6 +42,8 @@ #include "chrome/test/base/ui_test_utils.h" #include "components/history/core/browser/download_constants.h" #include "components/history/core/browser/download_row.h" +#include "components/prefs/pref_member.h" +#include "components/prefs/pref_service.h" #include "content/public/browser/download_item.h" #include "content/public/browser/download_manager.h" #include "content/public/browser/notification_service.h" |