diff options
142 files changed, 158 insertions, 158 deletions
diff --git a/base/base.gyp b/base/base.gyp index 8e91f30..052648a 100644 --- a/base/base.gyp +++ b/base/base.gyp @@ -345,6 +345,10 @@ 'prefs/overlay_user_pref_store.cc', 'prefs/overlay_user_pref_store.h', 'prefs/persistent_pref_store.h', + 'prefs/pref_change_registrar.cc', + 'prefs/pref_change_registrar.h', + 'prefs/pref_member.cc', + 'prefs/pref_member.h', 'prefs/pref_notifier.h', 'prefs/pref_notifier_impl.cc', 'prefs/pref_notifier_impl.h', @@ -363,10 +367,6 @@ 'prefs/pref_value_map.h', 'prefs/pref_value_store.cc', 'prefs/pref_value_store.h', - 'prefs/public/pref_change_registrar.cc', - 'prefs/public/pref_change_registrar.h', - 'prefs/public/pref_member.cc', - 'prefs/public/pref_member.h', 'prefs/value_map_pref_store.cc', 'prefs/value_map_pref_store.h', ], @@ -531,12 +531,12 @@ 'prefs/json_pref_store_unittest.cc', 'prefs/mock_pref_change_callback.h', 'prefs/overlay_user_pref_store_unittest.cc', + 'prefs/pref_change_registrar_unittest.cc', + 'prefs/pref_member_unittest.cc', 'prefs/pref_notifier_impl_unittest.cc', 'prefs/pref_service_unittest.cc', 'prefs/pref_value_map_unittest.cc', 'prefs/pref_value_store_unittest.cc', - 'prefs/public/pref_change_registrar_unittest.cc', - 'prefs/public/pref_member_unittest.cc', 'process_util_unittest.cc', 'process_util_unittest_ios.cc', 'process_util_unittest_mac.h', diff --git a/base/prefs/mock_pref_change_callback.h b/base/prefs/mock_pref_change_callback.h index 48a8802..0c2e3fa 100644 --- a/base/prefs/mock_pref_change_callback.h +++ b/base/prefs/mock_pref_change_callback.h @@ -7,8 +7,8 @@ #include <string> +#include "base/prefs/pref_change_registrar.h" #include "base/prefs/pref_service.h" -#include "base/prefs/public/pref_change_registrar.h" #include "testing/gmock/include/gmock/gmock.h" using testing::Pointee; diff --git a/base/prefs/public/pref_change_registrar.cc b/base/prefs/pref_change_registrar.cc index afa12bb..5e8709c 100644 --- a/base/prefs/public/pref_change_registrar.cc +++ b/base/prefs/pref_change_registrar.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/prefs/public/pref_change_registrar.h" +#include "base/prefs/pref_change_registrar.h" #include "base/bind.h" #include "base/logging.h" diff --git a/base/prefs/public/pref_change_registrar.h b/base/prefs/pref_change_registrar.h index 63882c3..c670f8b 100644 --- a/base/prefs/public/pref_change_registrar.h +++ b/base/prefs/pref_change_registrar.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BASE_PREFS_PUBLIC_PREF_CHANGE_REGISTRAR_H_ -#define BASE_PREFS_PUBLIC_PREF_CHANGE_REGISTRAR_H_ +#ifndef BASE_PREFS_PREF_CHANGE_REGISTRAR_H_ +#define BASE_PREFS_PREF_CHANGE_REGISTRAR_H_ #include <map> #include <string> @@ -77,4 +77,4 @@ class BASE_PREFS_EXPORT PrefChangeRegistrar : public PrefObserver { DISALLOW_COPY_AND_ASSIGN(PrefChangeRegistrar); }; -#endif // BASE_PREFS_PUBLIC_PREF_CHANGE_REGISTRAR_H_ +#endif // BASE_PREFS_PREF_CHANGE_REGISTRAR_H_ diff --git a/base/prefs/public/pref_change_registrar_unittest.cc b/base/prefs/pref_change_registrar_unittest.cc index b29f43a..49da721 100644 --- a/base/prefs/public/pref_change_registrar_unittest.cc +++ b/base/prefs/pref_change_registrar_unittest.cc @@ -4,9 +4,9 @@ #include "base/bind.h" #include "base/bind_helpers.h" +#include "base/prefs/pref_change_registrar.h" #include "base/prefs/pref_observer.h" #include "base/prefs/pref_registry_simple.h" -#include "base/prefs/public/pref_change_registrar.h" #include "base/prefs/testing_pref_service.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/base/prefs/public/pref_member.cc b/base/prefs/pref_member.cc index 13a0363..8a97818 100644 --- a/base/prefs/public/pref_member.cc +++ b/base/prefs/pref_member.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/prefs/public/pref_member.h" +#include "base/prefs/pref_member.h" #include "base/bind_helpers.h" #include "base/callback.h" diff --git a/base/prefs/public/pref_member.h b/base/prefs/pref_member.h index 4c82735..e0e88f5 100644 --- a/base/prefs/public/pref_member.h +++ b/base/prefs/pref_member.h @@ -21,8 +21,8 @@ // notify MyClass of changes. Note that if you use SetValue(), the observer // will not be notified. -#ifndef BASE_PREFS_PUBLIC_PREF_MEMBER_H_ -#define BASE_PREFS_PUBLIC_PREF_MEMBER_H_ +#ifndef BASE_PREFS_PREF_MEMBER_H_ +#define BASE_PREFS_PREF_MEMBER_H_ #include <string> #include <vector> @@ -351,4 +351,4 @@ typedef PrefMember<base::FilePath> FilePathPrefMember; // This preference member is expensive for large string arrays. typedef PrefMember<std::vector<std::string> > StringListPrefMember; -#endif // BASE_PREFS_PUBLIC_PREF_MEMBER_H_ +#endif // BASE_PREFS_PREF_MEMBER_H_ diff --git a/base/prefs/public/pref_member_unittest.cc b/base/prefs/pref_member_unittest.cc index 2a68059..5d49b4c 100644 --- a/base/prefs/public/pref_member_unittest.cc +++ b/base/prefs/pref_member_unittest.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/prefs/public/pref_member.h" +#include "base/prefs/pref_member.h" #include "base/bind.h" #include "base/message_loop.h" diff --git a/base/prefs/pref_service_unittest.cc b/base/prefs/pref_service_unittest.cc index 0c61a8e..26fe19a 100644 --- a/base/prefs/pref_service_unittest.cc +++ b/base/prefs/pref_service_unittest.cc @@ -6,9 +6,9 @@ #include "base/prefs/json_pref_store.h" #include "base/prefs/mock_pref_change_callback.h" +#include "base/prefs/pref_change_registrar.h" #include "base/prefs/pref_registry_simple.h" #include "base/prefs/pref_value_store.h" -#include "base/prefs/public/pref_change_registrar.h" #include "base/prefs/testing_pref_service.h" #include "base/prefs/testing_pref_store.h" #include "base/values.h" diff --git a/chrome/browser/app_controller_mac.h b/chrome/browser/app_controller_mac.h index 27f436b..cea9bfd 100644 --- a/chrome/browser/app_controller_mac.h +++ b/chrome/browser/app_controller_mac.h @@ -13,7 +13,7 @@ #include "base/memory/scoped_nsobject.h" #include "base/memory/scoped_ptr.h" #include "base/observer_list.h" -#include "base/prefs/public/pref_change_registrar.h" +#include "base/prefs/pref_change_registrar.h" #include "ui/base/work_area_watcher_observer.h" class BookmarkMenuBridge; diff --git a/chrome/browser/background/background_mode_manager.h b/chrome/browser/background/background_mode_manager.h index df95335..2287dec 100644 --- a/chrome/browser/background/background_mode_manager.h +++ b/chrome/browser/background/background_mode_manager.h @@ -8,7 +8,7 @@ #include <map> #include "base/gtest_prod_util.h" -#include "base/prefs/public/pref_change_registrar.h" +#include "base/prefs/pref_change_registrar.h" #include "chrome/browser/background/background_application_list_model.h" #include "chrome/browser/profiles/profile_info_cache_observer.h" #include "chrome/browser/profiles/profile_keyed_service.h" diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_process_impl.h index bd43d99..0213a72 100644 --- a/chrome/browser/browser_process_impl.h +++ b/chrome/browser/browser_process_impl.h @@ -16,7 +16,7 @@ #include "base/debug/stack_trace.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" -#include "base/prefs/public/pref_change_registrar.h" +#include "base/prefs/pref_change_registrar.h" #include "base/threading/non_thread_safe.h" #include "base/timer.h" #include "chrome/browser/browser_process.h" diff --git a/chrome/browser/browsing_data/browsing_data_remover.h b/chrome/browser/browsing_data/browsing_data_remover.h index 3fdf686..acb426e 100644 --- a/chrome/browser/browsing_data/browsing_data_remover.h +++ b/chrome/browser/browsing_data/browsing_data_remover.h @@ -10,7 +10,7 @@ #include "base/gtest_prod_util.h" #include "base/memory/ref_counted.h" #include "base/observer_list.h" -#include "base/prefs/public/pref_member.h" +#include "base/prefs/pref_member.h" #include "base/sequenced_task_runner_helpers.h" #include "base/synchronization/waitable_event_watcher.h" #include "base/time.h" diff --git a/chrome/browser/captive_portal/captive_portal_service.h b/chrome/browser/captive_portal/captive_portal_service.h index 6bd1713..b6f5541 100644 --- a/chrome/browser/captive_portal/captive_portal_service.h +++ b/chrome/browser/captive_portal/captive_portal_service.h @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" -#include "base/prefs/public/pref_member.h" +#include "base/prefs/pref_member.h" #include "base/threading/non_thread_safe.h" #include "base/time.h" #include "base/timer.h" diff --git a/chrome/browser/chromeos/accessibility/magnification_manager.cc b/chrome/browser/chromeos/accessibility/magnification_manager.cc index 6ae801a..60c9e71 100644 --- a/chrome/browser/chromeos/accessibility/magnification_manager.cc +++ b/chrome/browser/chromeos/accessibility/magnification_manager.cc @@ -10,8 +10,8 @@ #include "ash/system/tray/system_tray_notifier.h" #include "base/memory/scoped_ptr.h" #include "base/memory/singleton.h" +#include "base/prefs/pref_member.h" #include "base/prefs/pref_service.h" -#include "base/prefs/public/pref_member.h" #include "chrome/browser/chromeos/login/user_manager.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" diff --git a/chrome/browser/chromeos/audio/audio_handler.h b/chrome/browser/chromeos/audio/audio_handler.h index 662fdec..36bbb81 100644 --- a/chrome/browser/chromeos/audio/audio_handler.h +++ b/chrome/browser/chromeos/audio/audio_handler.h @@ -8,7 +8,7 @@ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" #include "base/observer_list.h" -#include "base/prefs/public/pref_change_registrar.h" +#include "base/prefs/pref_change_registrar.h" #include "base/threading/thread.h" template <typename T> struct DefaultSingletonTraits; diff --git a/chrome/browser/chromeos/drive/drive_file_system.cc b/chrome/browser/chromeos/drive/drive_file_system.cc index 2943dca..97a7faf 100644 --- a/chrome/browser/chromeos/drive/drive_file_system.cc +++ b/chrome/browser/chromeos/drive/drive_file_system.cc @@ -10,8 +10,8 @@ #include "base/message_loop_proxy.h" #include "base/metrics/histogram.h" #include "base/platform_file.h" +#include "base/prefs/pref_change_registrar.h" #include "base/prefs/pref_service.h" -#include "base/prefs/public/pref_change_registrar.h" #include "base/stringprintf.h" #include "base/threading/sequenced_worker_pool.h" #include "base/values.h" diff --git a/chrome/browser/chromeos/drive/drive_sync_client.cc b/chrome/browser/chromeos/drive/drive_sync_client.cc index 2b87df4..6083cdc 100644 --- a/chrome/browser/chromeos/drive/drive_sync_client.cc +++ b/chrome/browser/chromeos/drive/drive_sync_client.cc @@ -9,8 +9,8 @@ #include "base/bind.h" #include "base/message_loop_proxy.h" +#include "base/prefs/pref_change_registrar.h" #include "base/prefs/pref_service.h" -#include "base/prefs/public/pref_change_registrar.h" #include "chrome/browser/chromeos/drive/drive.pb.h" #include "chrome/browser/chromeos/drive/drive_file_system_interface.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/chromeos/extensions/file_browser_event_router.cc b/chrome/browser/chromeos/extensions/file_browser_event_router.cc index 6c41003..d26ba7e 100644 --- a/chrome/browser/chromeos/extensions/file_browser_event_router.cc +++ b/chrome/browser/chromeos/extensions/file_browser_event_router.cc @@ -8,8 +8,8 @@ #include "base/file_util.h" #include "base/json/json_writer.h" #include "base/message_loop.h" +#include "base/prefs/pref_change_registrar.h" #include "base/prefs/pref_service.h" -#include "base/prefs/public/pref_change_registrar.h" #include "base/stl_util.h" #include "base/values.h" #include "chrome/browser/chromeos/drive/drive_cache.h" diff --git a/chrome/browser/chromeos/login/login_utils.cc b/chrome/browser/chromeos/login/login_utils.cc index bb7c356..cffb0b4 100644 --- a/chrome/browser/chromeos/login/login_utils.cc +++ b/chrome/browser/chromeos/login/login_utils.cc @@ -17,9 +17,9 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/singleton.h" #include "base/path_service.h" +#include "base/prefs/pref_member.h" #include "base/prefs/pref_registry_simple.h" #include "base/prefs/pref_service.h" -#include "base/prefs/public/pref_member.h" #include "base/string_util.h" #include "base/synchronization/lock.h" #include "base/task_runner_util.h" diff --git a/chrome/browser/chromeos/power/session_length_limiter.h b/chrome/browser/chromeos/power/session_length_limiter.h index 6abaea0..389117f 100644 --- a/chrome/browser/chromeos/power/session_length_limiter.h +++ b/chrome/browser/chromeos/power/session_length_limiter.h @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" -#include "base/prefs/public/pref_change_registrar.h" +#include "base/prefs/pref_change_registrar.h" #include "base/threading/thread_checker.h" #include "base/time.h" #include "base/timer.h" diff --git a/chrome/browser/chromeos/preferences.cc b/chrome/browser/chromeos/preferences.cc index c5a62d9..721574f 100644 --- a/chrome/browser/chromeos/preferences.cc +++ b/chrome/browser/chromeos/preferences.cc @@ -9,8 +9,8 @@ #include "base/command_line.h" #include "base/i18n/time_formatting.h" #include "base/metrics/histogram.h" +#include "base/prefs/pref_member.h" #include "base/prefs/pref_registry_simple.h" -#include "base/prefs/public/pref_member.h" #include "base/string_util.h" #include "base/strings/string_split.h" #include "base/utf_string_conversions.h" diff --git a/chrome/browser/chromeos/preferences.h b/chrome/browser/chromeos/preferences.h index 25e6bc7..9662367 100644 --- a/chrome/browser/chromeos/preferences.h +++ b/chrome/browser/chromeos/preferences.h @@ -9,7 +9,7 @@ #include <vector> #include "base/compiler_specific.h" -#include "base/prefs/public/pref_member.h" +#include "base/prefs/pref_member.h" #include "chrome/browser/chromeos/language_preferences.h" #include "chrome/browser/prefs/pref_service_syncable_observer.h" diff --git a/chrome/browser/chromeos/preferences_unittest.cc b/chrome/browser/chromeos/preferences_unittest.cc index 31c4594..492e644 100644 --- a/chrome/browser/chromeos/preferences_unittest.cc +++ b/chrome/browser/chromeos/preferences_unittest.cc @@ -4,7 +4,7 @@ #include "chrome/browser/chromeos/preferences.h" -#include "base/prefs/public/pref_member.h" +#include "base/prefs/pref_member.h" #include "chrome/browser/chromeos/input_method/mock_input_method_manager.h" #include "chrome/browser/download/download_prefs.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/chromeos/proxy_config_service_impl.h b/chrome/browser/chromeos/proxy_config_service_impl.h index a6169da..53c71d8 100644 --- a/chrome/browser/chromeos/proxy_config_service_impl.h +++ b/chrome/browser/chromeos/proxy_config_service_impl.h @@ -9,7 +9,7 @@ #include <vector> #include "base/basictypes.h" -#include "base/prefs/public/pref_member.h" +#include "base/prefs/pref_member.h" #include "base/values.h" #include "chrome/browser/chromeos/cros/network_library.h" #include "chrome/browser/net/pref_proxy_config_tracker_impl.h" diff --git a/chrome/browser/chromeos/system/automatic_reboot_manager.h b/chrome/browser/chromeos/system/automatic_reboot_manager.h index 178a0fd..1cd75eb 100644 --- a/chrome/browser/chromeos/system/automatic_reboot_manager.h +++ b/chrome/browser/chromeos/system/automatic_reboot_manager.h @@ -10,7 +10,7 @@ #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" -#include "base/prefs/public/pref_change_registrar.h" +#include "base/prefs/pref_change_registrar.h" #include "base/time.h" #include "base/timer.h" #include "chromeos/dbus/power_manager_client.h" diff --git a/chrome/browser/content_settings/content_settings_default_provider.h b/chrome/browser/content_settings/content_settings_default_provider.h index 28a2fe1..9bc124b 100644 --- a/chrome/browser/content_settings/content_settings_default_provider.h +++ b/chrome/browser/content_settings/content_settings_default_provider.h @@ -11,7 +11,7 @@ #include "base/basictypes.h" #include "base/memory/linked_ptr.h" -#include "base/prefs/public/pref_change_registrar.h" +#include "base/prefs/pref_change_registrar.h" #include "base/synchronization/lock.h" #include "chrome/browser/content_settings/content_settings_observable_provider.h" diff --git a/chrome/browser/content_settings/content_settings_policy_provider.h b/chrome/browser/content_settings/content_settings_policy_provider.h index 6635996..2b1580b 100644 --- a/chrome/browser/content_settings/content_settings_policy_provider.h +++ b/chrome/browser/content_settings/content_settings_policy_provider.h @@ -10,7 +10,7 @@ #include <vector> #include "base/basictypes.h" -#include "base/prefs/public/pref_change_registrar.h" +#include "base/prefs/pref_change_registrar.h" #include "base/synchronization/lock.h" #include "chrome/browser/content_settings/content_settings_observable_provider.h" #include "chrome/browser/content_settings/content_settings_origin_identifier_value_map.h" diff --git a/chrome/browser/content_settings/content_settings_pref_provider.h b/chrome/browser/content_settings/content_settings_pref_provider.h index 4764138..33f4137 100644 --- a/chrome/browser/content_settings/content_settings_pref_provider.h +++ b/chrome/browser/content_settings/content_settings_pref_provider.h @@ -10,7 +10,7 @@ #include <vector> #include "base/basictypes.h" -#include "base/prefs/public/pref_change_registrar.h" +#include "base/prefs/pref_change_registrar.h" #include "base/synchronization/lock.h" #include "chrome/browser/content_settings/content_settings_observable_provider.h" #include "chrome/browser/content_settings/content_settings_origin_identifier_value_map.h" diff --git a/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc b/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc index d6d6be7..f951829 100644 --- a/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc +++ b/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc @@ -10,8 +10,8 @@ #include "base/message_loop.h" #include "base/prefs/default_pref_store.h" #include "base/prefs/overlay_user_pref_store.h" +#include "base/prefs/pref_change_registrar.h" #include "base/prefs/pref_service.h" -#include "base/prefs/public/pref_change_registrar.h" #include "base/prefs/testing_pref_store.h" #include "base/threading/platform_thread.h" #include "base/values.h" diff --git a/chrome/browser/content_settings/cookie_settings.h b/chrome/browser/content_settings/cookie_settings.h index 5be1c4c..4505db3 100644 --- a/chrome/browser/content_settings/cookie_settings.h +++ b/chrome/browser/content_settings/cookie_settings.h @@ -10,7 +10,7 @@ #include "base/compiler_specific.h" #include "base/memory/ref_counted.h" #include "base/memory/singleton.h" -#include "base/prefs/public/pref_change_registrar.h" +#include "base/prefs/pref_change_registrar.h" #include "base/synchronization/lock.h" #include "chrome/browser/content_settings/host_content_settings_map.h" #include "chrome/browser/profiles/refcounted_profile_keyed_service.h" diff --git a/chrome/browser/content_settings/host_content_settings_map.h b/chrome/browser/content_settings/host_content_settings_map.h index 1f1637f..28771da 100644 --- a/chrome/browser/content_settings/host_content_settings_map.h +++ b/chrome/browser/content_settings/host_content_settings_map.h @@ -14,7 +14,7 @@ #include "base/basictypes.h" #include "base/memory/ref_counted.h" -#include "base/prefs/public/pref_change_registrar.h" +#include "base/prefs/pref_change_registrar.h" #include "base/threading/platform_thread.h" #include "base/tuple.h" #include "chrome/browser/content_settings/content_settings_observer.h" diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrome/browser/download/chrome_download_manager_delegate.cc index 90091e4..20334cd 100644 --- a/chrome/browser/download/chrome_download_manager_delegate.cc +++ b/chrome/browser/download/chrome_download_manager_delegate.cc @@ -10,8 +10,8 @@ #include "base/bind_helpers.h" #include "base/callback.h" #include "base/file_util.h" +#include "base/prefs/pref_member.h" #include "base/prefs/pref_service.h" -#include "base/prefs/public/pref_member.h" #include "base/rand_util.h" #include "base/stringprintf.h" #include "base/time.h" diff --git a/chrome/browser/download/download_prefs.h b/chrome/browser/download/download_prefs.h index a55e19a..90ec566 100644 --- a/chrome/browser/download/download_prefs.h +++ b/chrome/browser/download/download_prefs.h @@ -8,7 +8,7 @@ #include <set> #include "base/files/file_path.h" -#include "base/prefs/public/pref_member.h" +#include "base/prefs/pref_member.h" class PrefRegistrySyncable; class PrefService; diff --git a/chrome/browser/download/save_package_file_picker.cc b/chrome/browser/download/save_package_file_picker.cc index 7844cfc..fe76d68 100644 --- a/chrome/browser/download/save_package_file_picker.cc +++ b/chrome/browser/download/save_package_file_picker.cc @@ -6,8 +6,8 @@ #include "base/command_line.h" #include "base/metrics/histogram.h" +#include "base/prefs/pref_member.h" #include "base/prefs/pref_service.h" -#include "base/prefs/public/pref_member.h" #include "base/utf_string_conversions.h" #include "chrome/browser/download/chrome_download_manager_delegate.h" #include "chrome/browser/download/download_prefs.h" diff --git a/chrome/browser/download/save_page_browsertest.cc b/chrome/browser/download/save_page_browsertest.cc index 110e2c8..d60d42c 100644 --- a/chrome/browser/download/save_page_browsertest.cc +++ b/chrome/browser/download/save_page_browsertest.cc @@ -9,8 +9,8 @@ #include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "base/path_service.h" +#include "base/prefs/pref_member.h" #include "base/prefs/pref_service.h" -#include "base/prefs/public/pref_member.h" #include "base/test/test_file_util.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/download/chrome_download_manager_delegate.h" diff --git a/chrome/browser/extensions/api/font_settings/font_settings_api.h b/chrome/browser/extensions/api/font_settings/font_settings_api.h index 93dcf9e..1955467 100644 --- a/chrome/browser/extensions/api/font_settings/font_settings_api.h +++ b/chrome/browser/extensions/api/font_settings/font_settings_api.h @@ -11,8 +11,8 @@ #include <string> #include "base/memory/scoped_ptr.h" +#include "base/prefs/pref_change_registrar.h" #include "base/prefs/pref_service.h" -#include "base/prefs/public/pref_change_registrar.h" #include "chrome/browser/extensions/api/profile_keyed_api_factory.h" #include "chrome/browser/extensions/event_router.h" #include "chrome/browser/extensions/extension_function.h" diff --git a/chrome/browser/extensions/api/managed_mode_private/managed_mode_private_api.h b/chrome/browser/extensions/api/managed_mode_private/managed_mode_private_api.h index af79897..7b4cfae 100644 --- a/chrome/browser/extensions/api/managed_mode_private/managed_mode_private_api.h +++ b/chrome/browser/extensions/api/managed_mode_private/managed_mode_private_api.h @@ -8,7 +8,7 @@ #ifndef CHROME_BROWSER_EXTENSIONS_API_MANAGED_MODE_PRIVATE_MANAGED_MODE_PRIVATE_API_H_ #define CHROME_BROWSER_EXTENSIONS_API_MANAGED_MODE_PRIVATE_MANAGED_MODE_PRIVATE_API_H_ -#include "base/prefs/public/pref_change_registrar.h" +#include "base/prefs/pref_change_registrar.h" #include "chrome/browser/extensions/api/profile_keyed_api_factory.h" #include "chrome/browser/extensions/event_router.h" #include "chrome/browser/extensions/extension_function.h" diff --git a/chrome/browser/extensions/api/preference/preference_api.h b/chrome/browser/extensions/api/preference/preference_api.h index d64b03b..c2a85de 100644 --- a/chrome/browser/extensions/api/preference/preference_api.h +++ b/chrome/browser/extensions/api/preference/preference_api.h @@ -7,7 +7,7 @@ #include <string> -#include "base/prefs/public/pref_change_registrar.h" +#include "base/prefs/pref_change_registrar.h" #include "chrome/browser/extensions/api/profile_keyed_api_factory.h" #include "chrome/browser/extensions/event_router.h" #include "chrome/browser/extensions/extension_function.h" diff --git a/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc b/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc index 0e03c64..c9a8447 100644 --- a/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc +++ b/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc @@ -15,7 +15,7 @@ #include "base/memory/weak_ptr.h" #include "base/message_loop.h" #include "base/path_service.h" -#include "base/prefs/public/pref_member.h" +#include "base/prefs/pref_member.h" #include "base/stl_util.h" #include "base/string_piece.h" #include "base/stringprintf.h" diff --git a/chrome/browser/extensions/component_loader.cc b/chrome/browser/extensions/component_loader.cc index 0b4e252..dbe212b 100644 --- a/chrome/browser/extensions/component_loader.cc +++ b/chrome/browser/extensions/component_loader.cc @@ -8,9 +8,9 @@ #include "base/file_util.h" #include "base/json/json_string_value_serializer.h" #include "base/path_service.h" +#include "base/prefs/pref_change_registrar.h" #include "base/prefs/pref_notifier.h" #include "base/prefs/pref_service.h" -#include "base/prefs/public/pref_change_registrar.h" #include "chrome/browser/defaults.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/extensions/component_loader.h b/chrome/browser/extensions/component_loader.h index 7f4bb8c..aef7975 100644 --- a/chrome/browser/extensions/component_loader.h +++ b/chrome/browser/extensions/component_loader.h @@ -10,7 +10,7 @@ #include "base/files/file_path.h" #include "base/gtest_prod_util.h" -#include "base/prefs/public/pref_change_registrar.h" +#include "base/prefs/pref_change_registrar.h" #include "base/values.h" class ExtensionServiceInterface; diff --git a/chrome/browser/extensions/extension_prefs_unittest.cc b/chrome/browser/extensions/extension_prefs_unittest.cc index b522880..37639c6 100644 --- a/chrome/browser/extensions/extension_prefs_unittest.cc +++ b/chrome/browser/extensions/extension_prefs_unittest.cc @@ -8,7 +8,7 @@ #include "base/files/scoped_temp_dir.h" #include "base/path_service.h" #include "base/prefs/mock_pref_change_callback.h" -#include "base/prefs/public/pref_change_registrar.h" +#include "base/prefs/pref_change_registrar.h" #include "base/stl_util.h" #include "base/stringprintf.h" #include "base/strings/string_number_conversions.h" diff --git a/chrome/browser/extensions/extension_service.h b/chrome/browser/extensions/extension_service.h index 7a4eaea..9585e21 100644 --- a/chrome/browser/extensions/extension_service.h +++ b/chrome/browser/extensions/extension_service.h @@ -16,7 +16,7 @@ #include "base/gtest_prod_util.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" -#include "base/prefs/public/pref_change_registrar.h" +#include "base/prefs/pref_change_registrar.h" #include "base/string16.h" #include "chrome/browser/extensions/app_sync_bundle.h" #include "chrome/browser/extensions/blacklist.h" diff --git a/chrome/browser/extensions/external_policy_loader.h b/chrome/browser/extensions/external_policy_loader.h index 64ba71aa..700810e 100644 --- a/chrome/browser/extensions/external_policy_loader.h +++ b/chrome/browser/extensions/external_policy_loader.h @@ -8,7 +8,7 @@ #include <string> #include "base/compiler_specific.h" -#include "base/prefs/public/pref_change_registrar.h" +#include "base/prefs/pref_change_registrar.h" #include "chrome/browser/extensions/external_loader.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" diff --git a/chrome/browser/extensions/install_tracker.h b/chrome/browser/extensions/install_tracker.h index 3c65504..e53347a 100644 --- a/chrome/browser/extensions/install_tracker.h +++ b/chrome/browser/extensions/install_tracker.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_EXTENSIONS_INSTALL_TRACKER_H_ #include "base/observer_list.h" -#include "base/prefs/public/pref_change_registrar.h" +#include "base/prefs/pref_change_registrar.h" #include "chrome/browser/extensions/install_observer.h" #include "chrome/browser/profiles/profile_keyed_service.h" #include "content/public/browser/notification_observer.h" diff --git a/chrome/browser/gpu/gpu_mode_manager.h b/chrome/browser/gpu/gpu_mode_manager.h index 43b4002..3730c88 100644 --- a/chrome/browser/gpu/gpu_mode_manager.h +++ b/chrome/browser/gpu/gpu_mode_manager.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_GPU_GPU_MODE_MANAGER_H_ #define CHROME_BROWSER_GPU_GPU_MODE_MANAGER_H_ -#include "base/prefs/public/pref_change_registrar.h" +#include "base/prefs/pref_change_registrar.h" class PrefRegistrySimple; diff --git a/chrome/browser/io_thread.h b/chrome/browser/io_thread.h index 627dcfb..ba1e0ba 100644 --- a/chrome/browser/io_thread.h +++ b/chrome/browser/io_thread.h @@ -12,7 +12,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" -#include "base/prefs/public/pref_member.h" +#include "base/prefs/pref_member.h" #include "chrome/browser/net/ssl_config_service_manager.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/browser_thread_delegate.h" diff --git a/chrome/browser/managed_mode/managed_mode.cc b/chrome/browser/managed_mode/managed_mode.cc index 01cb1f7..a68b2f0 100644 --- a/chrome/browser/managed_mode/managed_mode.cc +++ b/chrome/browser/managed_mode/managed_mode.cc @@ -5,9 +5,9 @@ #include "chrome/browser/managed_mode/managed_mode.h" #include "base/command_line.h" +#include "base/prefs/pref_change_registrar.h" #include "base/prefs/pref_registry_simple.h" #include "base/prefs/pref_service.h" -#include "base/prefs/public/pref_change_registrar.h" #include "base/sequenced_task_runner.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/managed_mode/managed_mode_site_list.h" diff --git a/chrome/browser/managed_mode/managed_user_service.h b/chrome/browser/managed_mode/managed_user_service.h index 6dbcfa2..59588cc 100644 --- a/chrome/browser/managed_mode/managed_user_service.h +++ b/chrome/browser/managed_mode/managed_user_service.h @@ -8,7 +8,7 @@ #include <set> #include <vector> -#include "base/prefs/public/pref_change_registrar.h" +#include "base/prefs/pref_change_registrar.h" #include "base/string16.h" #include "chrome/browser/extensions/management_policy.h" #include "chrome/browser/managed_mode/managed_mode_url_filter.h" diff --git a/chrome/browser/media_galleries/media_file_system_registry.h b/chrome/browser/media_galleries/media_file_system_registry.h index 848396b..c9ff14b 100644 --- a/chrome/browser/media_galleries/media_file_system_registry.h +++ b/chrome/browser/media_galleries/media_file_system_registry.h @@ -16,7 +16,7 @@ #include "base/basictypes.h" #include "base/files/file_path.h" #include "base/memory/ref_counted.h" -#include "base/prefs/public/pref_change_registrar.h" +#include "base/prefs/pref_change_registrar.h" #include "chrome/browser/media_galleries/media_galleries_preferences.h" #include "chrome/browser/storage_monitor/removable_storage_observer.h" #include "webkit/fileapi/media/mtp_device_file_system_config.h" diff --git a/chrome/browser/net/chrome_http_user_agent_settings.h b/chrome/browser/net/chrome_http_user_agent_settings.h index 41662a7..484349c 100644 --- a/chrome/browser/net/chrome_http_user_agent_settings.h +++ b/chrome/browser/net/chrome_http_user_agent_settings.h @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "base/prefs/public/pref_member.h" +#include "base/prefs/pref_member.h" #include "net/url_request/http_user_agent_settings.h" class PrefService; diff --git a/chrome/browser/net/chrome_network_delegate.cc b/chrome/browser/net/chrome_network_delegate.cc index 5dee970..88b9d49 100644 --- a/chrome/browser/net/chrome_network_delegate.cc +++ b/chrome/browser/net/chrome_network_delegate.cc @@ -12,8 +12,8 @@ #include "base/logging.h" #include "base/metrics/histogram.h" #include "base/path_service.h" +#include "base/prefs/pref_member.h" #include "base/prefs/pref_service.h" -#include "base/prefs/public/pref_member.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" #include "chrome/browser/browser_process.h" diff --git a/chrome/browser/net/chrome_network_delegate_unittest.cc b/chrome/browser/net/chrome_network_delegate_unittest.cc index 4e156eb..f822195 100644 --- a/chrome/browser/net/chrome_network_delegate_unittest.cc +++ b/chrome/browser/net/chrome_network_delegate_unittest.cc @@ -7,7 +7,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" -#include "base/prefs/public/pref_member.h" +#include "base/prefs/pref_member.h" #include "chrome/browser/extensions/event_router_forwarder.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" diff --git a/chrome/browser/net/http_server_properties_manager.h b/chrome/browser/net/http_server_properties_manager.h index 48dfd2d..d7b1b3cbf 100644 --- a/chrome/browser/net/http_server_properties_manager.h +++ b/chrome/browser/net/http_server_properties_manager.h @@ -11,7 +11,7 @@ #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" -#include "base/prefs/public/pref_change_registrar.h" +#include "base/prefs/pref_change_registrar.h" #include "base/timer.h" #include "base/values.h" #include "net/base/host_port_pair.h" diff --git a/chrome/browser/net/net_error_tab_helper.h b/chrome/browser/net/net_error_tab_helper.h index 910e163..e48fa9f 100644 --- a/chrome/browser/net/net_error_tab_helper.h +++ b/chrome/browser/net/net_error_tab_helper.h @@ -8,7 +8,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/memory/weak_ptr.h" -#include "base/prefs/public/pref_member.h" +#include "base/prefs/pref_member.h" #include "chrome/browser/net/dns_probe_service.h" #include "chrome/common/net/net_error_info.h" #include "chrome/common/net/net_error_tracker.h" diff --git a/chrome/browser/net/net_pref_observer.h b/chrome/browser/net/net_pref_observer.h index e4d497f..37a051a 100644 --- a/chrome/browser/net/net_pref_observer.h +++ b/chrome/browser/net/net_pref_observer.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_NET_NET_PREF_OBSERVER_H_ #include "base/basictypes.h" -#include "base/prefs/public/pref_member.h" +#include "base/prefs/pref_member.h" namespace chrome_browser_net { class Predictor; diff --git a/chrome/browser/net/pref_proxy_config_tracker_impl.h b/chrome/browser/net/pref_proxy_config_tracker_impl.h index a449527..1d6a96d 100644 --- a/chrome/browser/net/pref_proxy_config_tracker_impl.h +++ b/chrome/browser/net/pref_proxy_config_tracker_impl.h @@ -9,7 +9,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/observer_list.h" -#include "base/prefs/public/pref_change_registrar.h" +#include "base/prefs/pref_change_registrar.h" #include "chrome/browser/prefs/proxy_config_dictionary.h" #include "net/proxy/proxy_config.h" #include "net/proxy/proxy_config_service.h" diff --git a/chrome/browser/net/ssl_config_service_manager_pref.cc b/chrome/browser/net/ssl_config_service_manager_pref.cc index f7679dcb..c193463 100644 --- a/chrome/browser/net/ssl_config_service_manager_pref.cc +++ b/chrome/browser/net/ssl_config_service_manager_pref.cc @@ -9,10 +9,10 @@ #include "base/basictypes.h" #include "base/bind.h" +#include "base/prefs/pref_change_registrar.h" +#include "base/prefs/pref_member.h" #include "base/prefs/pref_registry_simple.h" #include "base/prefs/pref_service.h" -#include "base/prefs/public/pref_change_registrar.h" -#include "base/prefs/public/pref_member.h" #include "chrome/browser/content_settings/content_settings_utils.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/content_settings.h" diff --git a/chrome/browser/notifications/balloon_notification_ui_manager.h b/chrome/browser/notifications/balloon_notification_ui_manager.h index 1c1f091c..12bb78e 100644 --- a/chrome/browser/notifications/balloon_notification_ui_manager.h +++ b/chrome/browser/notifications/balloon_notification_ui_manager.h @@ -8,7 +8,7 @@ #include <string> #include "base/memory/scoped_ptr.h" -#include "base/prefs/public/pref_member.h" +#include "base/prefs/pref_member.h" #include "chrome/browser/notifications/balloon.h" #include "chrome/browser/notifications/balloon_collection.h" #include "chrome/browser/notifications/notification_prefs_manager.h" diff --git a/chrome/browser/notifications/desktop_notification_service.h b/chrome/browser/notifications/desktop_notification_service.h index 4ccd873..9645662 100644 --- a/chrome/browser/notifications/desktop_notification_service.h +++ b/chrome/browser/notifications/desktop_notification_service.h @@ -11,7 +11,7 @@ #include "base/basictypes.h" #include "base/memory/ref_counted.h" -#include "base/prefs/public/pref_member.h" +#include "base/prefs/pref_member.h" #include "base/string16.h" #include "chrome/browser/content_settings/content_settings_provider.h" #include "chrome/browser/profiles/profile_keyed_service.h" diff --git a/chrome/browser/notifications/notification_ui_manager_impl.h b/chrome/browser/notifications/notification_ui_manager_impl.h index c841552..7e56336 100644 --- a/chrome/browser/notifications/notification_ui_manager_impl.h +++ b/chrome/browser/notifications/notification_ui_manager_impl.h @@ -11,7 +11,7 @@ #include "base/id_map.h" #include "base/memory/linked_ptr.h" -#include "base/prefs/public/pref_member.h" +#include "base/prefs/pref_member.h" #include "base/timer.h" #include "chrome/browser/notifications/notification_ui_manager.h" #include "content/public/browser/notification_observer.h" diff --git a/chrome/browser/password_manager/password_manager.h b/chrome/browser/password_manager/password_manager.h index 0911ffd..f458ce3 100644 --- a/chrome/browser/password_manager/password_manager.h +++ b/chrome/browser/password_manager/password_manager.h @@ -9,7 +9,7 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" -#include "base/prefs/public/pref_member.h" +#include "base/prefs/pref_member.h" #include "base/stl_util.h" #include "chrome/browser/password_manager/password_form_manager.h" #include "chrome/browser/ui/login/login_model.h" diff --git a/chrome/browser/plugins/plugin_info_message_filter.h b/chrome/browser/plugins/plugin_info_message_filter.h index 12c97ac..9eaafe1 100644 --- a/chrome/browser/plugins/plugin_info_message_filter.h +++ b/chrome/browser/plugins/plugin_info_message_filter.h @@ -10,7 +10,7 @@ #include "base/compiler_specific.h" #include "base/memory/weak_ptr.h" -#include "base/prefs/public/pref_member.h" +#include "base/prefs/pref_member.h" #include "base/sequenced_task_runner_helpers.h" #include "chrome/common/content_settings.h" #include "content/public/browser/browser_message_filter.h" diff --git a/chrome/browser/plugins/plugin_prefs.h b/chrome/browser/plugins/plugin_prefs.h index 4aca8f7..96f62db 100644 --- a/chrome/browser/plugins/plugin_prefs.h +++ b/chrome/browser/plugins/plugin_prefs.h @@ -11,8 +11,8 @@ #include "base/basictypes.h" #include "base/files/file_path.h" +#include "base/prefs/pref_change_registrar.h" #include "base/prefs/pref_service.h" -#include "base/prefs/public/pref_change_registrar.h" #include "base/synchronization/lock.h" #include "chrome/browser/plugins/plugin_finder.h" #include "chrome/browser/profiles/refcounted_profile_keyed_service.h" diff --git a/chrome/browser/plugins/plugin_status_pref_setter.h b/chrome/browser/plugins/plugin_status_pref_setter.h index 6242170..034b74a 100644 --- a/chrome/browser/plugins/plugin_status_pref_setter.h +++ b/chrome/browser/plugins/plugin_status_pref_setter.h @@ -9,7 +9,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" -#include "base/prefs/public/pref_member.h" +#include "base/prefs/pref_member.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" diff --git a/chrome/browser/policy/cloud/cloud_policy_core.h b/chrome/browser/policy/cloud/cloud_policy_core.h index 540a15a..96135dc 100644 --- a/chrome/browser/policy/cloud/cloud_policy_core.h +++ b/chrome/browser/policy/cloud/cloud_policy_core.h @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" -#include "base/prefs/public/pref_member.h" +#include "base/prefs/pref_member.h" #include "chrome/browser/policy/cloud/cloud_policy_constants.h" class PrefService; diff --git a/chrome/browser/policy/cloud/cloud_policy_manager.h b/chrome/browser/policy/cloud/cloud_policy_manager.h index f608127..34be652 100644 --- a/chrome/browser/policy/cloud/cloud_policy_manager.h +++ b/chrome/browser/policy/cloud/cloud_policy_manager.h @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "base/prefs/public/pref_member.h" +#include "base/prefs/pref_member.h" #include "chrome/browser/policy/cloud/cloud_policy_constants.h" #include "chrome/browser/policy/cloud/cloud_policy_core.h" #include "chrome/browser/policy/cloud/cloud_policy_store.h" diff --git a/chrome/browser/policy/url_blacklist_manager.h b/chrome/browser/policy/url_blacklist_manager.h index a4390ef..d722e45 100644 --- a/chrome/browser/policy/url_blacklist_manager.h +++ b/chrome/browser/policy/url_blacklist_manager.h @@ -14,7 +14,7 @@ #include "base/hash_tables.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" -#include "base/prefs/public/pref_change_registrar.h" +#include "base/prefs/pref_change_registrar.h" #include "extensions/common/matcher/url_matcher.h" class GURL; diff --git a/chrome/browser/prefs/scoped_user_pref_update_unittest.cc b/chrome/browser/prefs/scoped_user_pref_update_unittest.cc index f12c099..ccb0834 100644 --- a/chrome/browser/prefs/scoped_user_pref_update_unittest.cc +++ b/chrome/browser/prefs/scoped_user_pref_update_unittest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/prefs/mock_pref_change_callback.h" -#include "base/prefs/public/pref_change_registrar.h" +#include "base/prefs/pref_change_registrar.h" #include "chrome/browser/prefs/scoped_user_pref_update.h" #include "chrome/test/base/testing_pref_service_syncable.h" #include "components/user_prefs/pref_registry_syncable.h" diff --git a/chrome/browser/printing/cloud_print/cloud_print_proxy_service.h b/chrome/browser/printing/cloud_print/cloud_print_proxy_service.h index f7e0b5c..610c5c1 100644 --- a/chrome/browser/printing/cloud_print/cloud_print_proxy_service.h +++ b/chrome/browser/printing/cloud_print/cloud_print_proxy_service.h @@ -12,7 +12,7 @@ #include "base/callback_forward.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" -#include "base/prefs/public/pref_change_registrar.h" +#include "base/prefs/pref_change_registrar.h" #include "chrome/browser/printing/cloud_print/cloud_print_setup_handler.h" #include "chrome/browser/profiles/profile_keyed_service.h" diff --git a/chrome/browser/printing/print_view_manager.h b/chrome/browser/printing/print_view_manager.h index 301c6ac..c0c4d35 100644 --- a/chrome/browser/printing/print_view_manager.h +++ b/chrome/browser/printing/print_view_manager.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_PRINTING_PRINT_VIEW_MANAGER_H_ #include "base/memory/ref_counted.h" -#include "base/prefs/public/pref_member.h" +#include "base/prefs/pref_member.h" #include "base/string16.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" diff --git a/chrome/browser/profiles/gaia_info_update_service.h b/chrome/browser/profiles/gaia_info_update_service.h index cc7128e..2ae5eae 100644 --- a/chrome/browser/profiles/gaia_info_update_service.h +++ b/chrome/browser/profiles/gaia_info_update_service.h @@ -8,7 +8,7 @@ #include "base/compiler_specific.h" #include "base/gtest_prod_util.h" #include "base/memory/scoped_ptr.h" -#include "base/prefs/public/pref_member.h" +#include "base/prefs/pref_member.h" #include "base/timer.h" #include "chrome/browser/profiles/profile_downloader.h" #include "chrome/browser/profiles/profile_downloader_delegate.h" diff --git a/chrome/browser/profiles/profile_impl.h b/chrome/browser/profiles/profile_impl.h index 961a2b3..f0b0079 100644 --- a/chrome/browser/profiles/profile_impl.h +++ b/chrome/browser/profiles/profile_impl.h @@ -13,7 +13,7 @@ #include "base/gtest_prod_util.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" -#include "base/prefs/public/pref_change_registrar.h" +#include "base/prefs/pref_change_registrar.h" #include "base/timer.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_impl_io_data.h" diff --git a/chrome/browser/profiles/profile_impl_io_data.cc b/chrome/browser/profiles/profile_impl_io_data.cc index 38e5d87..b396b9e 100644 --- a/chrome/browser/profiles/profile_impl_io_data.cc +++ b/chrome/browser/profiles/profile_impl_io_data.cc @@ -8,8 +8,8 @@ #include "base/command_line.h" #include "base/file_util.h" #include "base/logging.h" +#include "base/prefs/pref_member.h" #include "base/prefs/pref_service.h" -#include "base/prefs/public/pref_member.h" #include "base/sequenced_task_runner.h" #include "base/stl_util.h" #include "base/threading/sequenced_worker_pool.h" diff --git a/chrome/browser/profiles/profile_io_data.h b/chrome/browser/profiles/profile_io_data.h index 406fa98..0aeda49 100644 --- a/chrome/browser/profiles/profile_io_data.h +++ b/chrome/browser/profiles/profile_io_data.h @@ -13,7 +13,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" -#include "base/prefs/public/pref_member.h" +#include "base/prefs/pref_member.h" #include "base/synchronization/lock.h" #include "chrome/browser/custom_handlers/protocol_handler_registry.h" #include "chrome/browser/io_thread.h" diff --git a/chrome/browser/safe_browsing/safe_browsing_service.cc b/chrome/browser/safe_browsing/safe_browsing_service.cc index afd0ca5..e1e35a1 100644 --- a/chrome/browser/safe_browsing/safe_browsing_service.cc +++ b/chrome/browser/safe_browsing/safe_browsing_service.cc @@ -11,8 +11,8 @@ #include "base/debug/leak_tracker.h" #include "base/lazy_instance.h" #include "base/path_service.h" +#include "base/prefs/pref_change_registrar.h" #include "base/prefs/pref_service.h" -#include "base/prefs/public/pref_change_registrar.h" #include "base/stl_util.h" #include "base/string_util.h" #include "base/threading/thread.h" diff --git a/chrome/browser/safe_browsing/safe_browsing_tab_observer.h b/chrome/browser/safe_browsing/safe_browsing_tab_observer.h index 45e7be4..e9f563b 100644 --- a/chrome/browser/safe_browsing/safe_browsing_tab_observer.h +++ b/chrome/browser/safe_browsing/safe_browsing_tab_observer.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_TAB_OBSERVER_H_ #include "base/memory/scoped_ptr.h" -#include "base/prefs/public/pref_change_registrar.h" +#include "base/prefs/pref_change_registrar.h" #include "content/public/browser/web_contents_user_data.h" namespace content { diff --git a/chrome/browser/search_engines/template_url_service.h b/chrome/browser/search_engines/template_url_service.h index be087bf..ed94689 100644 --- a/chrome/browser/search_engines/template_url_service.h +++ b/chrome/browser/search_engines/template_url_service.h @@ -14,7 +14,7 @@ #include "base/gtest_prod_util.h" #include "base/memory/scoped_ptr.h" #include "base/observer_list.h" -#include "base/prefs/public/pref_change_registrar.h" +#include "base/prefs/pref_change_registrar.h" #include "chrome/browser/profiles/profile_keyed_service.h" #include "chrome/browser/search_engines/template_url_id.h" #include "chrome/browser/webdata/web_data_service.h" diff --git a/chrome/browser/signin/signin_manager.h b/chrome/browser/signin/signin_manager.h index 01f5e5a..7b55400 100644 --- a/chrome/browser/signin/signin_manager.h +++ b/chrome/browser/signin/signin_manager.h @@ -24,8 +24,8 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/observer_list.h" -#include "base/prefs/public/pref_change_registrar.h" -#include "base/prefs/public/pref_member.h" +#include "base/prefs/pref_change_registrar.h" +#include "base/prefs/pref_member.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_keyed_service.h" #include "chrome/browser/signin/signin_internals_util.h" diff --git a/chrome/browser/speech/chrome_speech_recognition_preferences.h b/chrome/browser/speech/chrome_speech_recognition_preferences.h index c3b4242..30481c9 100644 --- a/chrome/browser/speech/chrome_speech_recognition_preferences.h +++ b/chrome/browser/speech/chrome_speech_recognition_preferences.h @@ -9,7 +9,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/singleton.h" -#include "base/prefs/public/pref_change_registrar.h" +#include "base/prefs/pref_change_registrar.h" #include "base/synchronization/lock.h" #include "base/threading/non_thread_safe.h" #include "chrome/browser/profiles/profile_keyed_service.h" diff --git a/chrome/browser/spellchecker/spellcheck_service.cc b/chrome/browser/spellchecker/spellcheck_service.cc index d9e9310..d3d5182 100644 --- a/chrome/browser/spellchecker/spellcheck_service.cc +++ b/chrome/browser/spellchecker/spellcheck_service.cc @@ -5,8 +5,8 @@ #include "chrome/browser/spellchecker/spellcheck_service.h" #include "base/platform_file.h" +#include "base/prefs/pref_member.h" #include "base/prefs/pref_service.h" -#include "base/prefs/public/pref_member.h" #include "base/strings/string_split.h" #include "base/synchronization/waitable_event.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/spellchecker/spellcheck_service.h b/chrome/browser/spellchecker/spellcheck_service.h index a863156..438eff2 100644 --- a/chrome/browser/spellchecker/spellcheck_service.h +++ b/chrome/browser/spellchecker/spellcheck_service.h @@ -5,11 +5,11 @@ #ifndef CHROME_BROWSER_SPELLCHECKER_SPELLCHECK_SERVICE_H_ #define CHROME_BROWSER_SPELLCHECKER_SPELLCHECK_SERVICE_H_ -#include "base/gtest_prod_util.h" #include "base/compiler_specific.h" +#include "base/gtest_prod_util.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" -#include "base/prefs/public/pref_change_registrar.h" +#include "base/prefs/pref_change_registrar.h" #include "chrome/browser/profiles/profile_keyed_service.h" #include "chrome/browser/spellchecker/spellcheck_custom_dictionary.h" #include "chrome/browser/spellchecker/spellcheck_hunspell_dictionary.h" diff --git a/chrome/browser/sync/glue/typed_url_data_type_controller.h b/chrome/browser/sync/glue/typed_url_data_type_controller.h index 13168db..9afd3e0 100644 --- a/chrome/browser/sync/glue/typed_url_data_type_controller.h +++ b/chrome/browser/sync/glue/typed_url_data_type_controller.h @@ -9,7 +9,7 @@ #include "base/compiler_specific.h" #include "base/memory/ref_counted.h" -#include "base/prefs/public/pref_change_registrar.h" +#include "base/prefs/pref_change_registrar.h" #include "chrome/browser/common/cancelable_request.h" #include "chrome/browser/sync/glue/non_frontend_data_type_controller.h" diff --git a/chrome/browser/sync/sync_prefs.cc b/chrome/browser/sync/sync_prefs.cc index 2866dd5..e26d56e 100644 --- a/chrome/browser/sync/sync_prefs.cc +++ b/chrome/browser/sync/sync_prefs.cc @@ -6,8 +6,8 @@ #include "base/command_line.h" #include "base/logging.h" +#include "base/prefs/pref_member.h" #include "base/prefs/pref_service.h" -#include "base/prefs/public/pref_member.h" #include "base/strings/string_number_conversions.h" #include "base/values.h" #include "build/build_config.h" diff --git a/chrome/browser/sync/sync_prefs.h b/chrome/browser/sync/sync_prefs.h index 411e95e..e259866 100644 --- a/chrome/browser/sync/sync_prefs.h +++ b/chrome/browser/sync/sync_prefs.h @@ -9,7 +9,7 @@ #include "base/compiler_specific.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" -#include "base/prefs/public/pref_member.h" +#include "base/prefs/pref_member.h" #include "base/threading/non_thread_safe.h" #include "base/time.h" #include "sync/internal_api/public/base/model_type.h" diff --git a/chrome/browser/sync/test/integration/sync_errors_test.cc b/chrome/browser/sync/test/integration/sync_errors_test.cc index 4f65f4c..6fb9c71 100644 --- a/chrome/browser/sync/test/integration/sync_errors_test.cc +++ b/chrome/browser/sync/test/integration/sync_errors_test.cc @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/prefs/pref_member.h" #include "base/prefs/pref_service.h" -#include "base/prefs/public/pref_member.h" #include "chrome/browser/sync/profile_sync_service.h" #include "chrome/browser/sync/profile_sync_service_harness.h" #include "chrome/browser/sync/test/integration/bookmarks_helper.h" diff --git a/chrome/browser/tab_contents/render_view_context_menu.cc b/chrome/browser/tab_contents/render_view_context_menu.cc index 1998ddd..5a4fcc7 100644 --- a/chrome/browser/tab_contents/render_view_context_menu.cc +++ b/chrome/browser/tab_contents/render_view_context_menu.cc @@ -11,8 +11,8 @@ #include "base/command_line.h" #include "base/logging.h" #include "base/metrics/histogram.h" +#include "base/prefs/pref_member.h" #include "base/prefs/pref_service.h" -#include "base/prefs/public/pref_member.h" #include "base/stl_util.h" #include "base/string_util.h" #include "base/time.h" diff --git a/chrome/browser/tab_contents/spellchecker_submenu_observer_hunspell.cc b/chrome/browser/tab_contents/spellchecker_submenu_observer_hunspell.cc index 038b451..1299525 100644 --- a/chrome/browser/tab_contents/spellchecker_submenu_observer_hunspell.cc +++ b/chrome/browser/tab_contents/spellchecker_submenu_observer_hunspell.cc @@ -6,8 +6,8 @@ #include "base/command_line.h" #include "base/logging.h" +#include "base/prefs/pref_member.h" #include "base/prefs/pref_service.h" -#include "base/prefs/public/pref_member.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/spellchecker/spellcheck_service.h" diff --git a/chrome/browser/tab_contents/spelling_menu_observer.h b/chrome/browser/tab_contents/spelling_menu_observer.h index e78d9d3..03c2c4e 100644 --- a/chrome/browser/tab_contents/spelling_menu_observer.h +++ b/chrome/browser/tab_contents/spelling_menu_observer.h @@ -9,7 +9,7 @@ #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" -#include "base/prefs/public/pref_member.h" +#include "base/prefs/pref_member.h" #include "base/string16.h" #include "base/timer.h" #include "chrome/browser/spellchecker/spelling_service_client.h" diff --git a/chrome/browser/translate/translate_manager.h b/chrome/browser/translate/translate_manager.h index 8c7ae64..cbab8da 100644 --- a/chrome/browser/translate/translate_manager.h +++ b/chrome/browser/translate/translate_manager.h @@ -14,7 +14,7 @@ #include "base/lazy_instance.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" -#include "base/prefs/public/pref_change_registrar.h" +#include "base/prefs/pref_change_registrar.h" #include "base/time.h" #include "chrome/common/translate_errors.h" #include "content/public/browser/notification_observer.h" diff --git a/chrome/browser/translate/translate_manager_browsertest.cc b/chrome/browser/translate/translate_manager_browsertest.cc index 73e8681..ae81106 100644 --- a/chrome/browser/translate/translate_manager_browsertest.cc +++ b/chrome/browser/translate/translate_manager_browsertest.cc @@ -9,8 +9,8 @@ #include "base/json/json_writer.h" #include "base/memory/scoped_ptr.h" +#include "base/prefs/pref_change_registrar.h" #include "base/prefs/pref_service.h" -#include "base/prefs/public/pref_change_registrar.h" #include "base/stringprintf.h" #include "base/utf_string_conversions.h" #include "base/values.h" diff --git a/chrome/browser/ui/alternate_error_tab_observer.h b/chrome/browser/ui/alternate_error_tab_observer.h index 6809268..9ecf45f 100644 --- a/chrome/browser/ui/alternate_error_tab_observer.h +++ b/chrome/browser/ui/alternate_error_tab_observer.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_ALTERNATE_ERROR_TAB_OBSERVER_H_ #define CHROME_BROWSER_UI_ALTERNATE_ERROR_TAB_OBSERVER_H_ -#include "base/prefs/public/pref_change_registrar.h" +#include "base/prefs/pref_change_registrar.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/web_contents_observer.h" diff --git a/chrome/browser/ui/ash/event_rewriter_unittest.cc b/chrome/browser/ui/ash/event_rewriter_unittest.cc index b785f85..921e8af 100644 --- a/chrome/browser/ui/ash/event_rewriter_unittest.cc +++ b/chrome/browser/ui/ash/event_rewriter_unittest.cc @@ -6,7 +6,7 @@ #include "base/basictypes.h" #include "base/command_line.h" -#include "base/prefs/public/pref_member.h" +#include "base/prefs/pref_member.h" #include "base/stringprintf.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.h b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.h index 58f5c0c..9cc330b 100644 --- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.h +++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.h @@ -18,7 +18,7 @@ #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" -#include "base/prefs/public/pref_change_registrar.h" +#include "base/prefs/pref_change_registrar.h" #include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/prefs/pref_service_syncable_observer.h" #include "chrome/browser/ui/ash/app_sync_ui_state_observer.h" diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser.h b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser.h index a63ff8b..a57bbce 100644 --- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser.h +++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser.h @@ -17,7 +17,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" -#include "base/prefs/public/pref_change_registrar.h" +#include "base/prefs/pref_change_registrar.h" #include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/prefs/pref_service_syncable_observer.h" #include "chrome/browser/ui/ash/app_sync_ui_state_observer.h" diff --git a/chrome/browser/ui/autofill/autofill_dialog_models.h b/chrome/browser/ui/autofill/autofill_dialog_models.h index 77f87aa..97a7add 100644 --- a/chrome/browser/ui/autofill/autofill_dialog_models.h +++ b/chrome/browser/ui/autofill/autofill_dialog_models.h @@ -10,7 +10,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "base/prefs/public/pref_change_registrar.h" +#include "base/prefs/pref_change_registrar.h" #include "base/string16.h" #include "ui/base/models/combobox_model.h" #include "ui/base/models/simple_menu_model.h" diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h index 31b3f6d..d2c99df 100644 --- a/chrome/browser/ui/browser.h +++ b/chrome/browser/ui/browser.h @@ -15,8 +15,8 @@ #include "base/gtest_prod_util.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" -#include "base/prefs/public/pref_change_registrar.h" -#include "base/prefs/public/pref_member.h" +#include "base/prefs/pref_change_registrar.h" +#include "base/prefs/pref_member.h" #include "base/string16.h" #include "chrome/browser/devtools/devtools_toggle_action.h" #include "chrome/browser/sessions/session_id.h" diff --git a/chrome/browser/ui/browser_command_controller.h b/chrome/browser/ui/browser_command_controller.h index d12b45f..37b5e18 100644 --- a/chrome/browser/ui/browser_command_controller.h +++ b/chrome/browser/ui/browser_command_controller.h @@ -7,8 +7,8 @@ #include <vector> -#include "base/prefs/public/pref_change_registrar.h" -#include "base/prefs/public/pref_member.h" +#include "base/prefs/pref_change_registrar.h" +#include "base/prefs/pref_member.h" #include "chrome/browser/command_updater.h" #include "chrome/browser/command_updater_delegate.h" #include "chrome/browser/profiles/profile_info_cache_observer.h" diff --git a/chrome/browser/ui/browser_instant_controller.h b/chrome/browser/ui/browser_instant_controller.h index 3708669..c84e4dc 100644 --- a/chrome/browser/ui/browser_instant_controller.h +++ b/chrome/browser/ui/browser_instant_controller.h @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "base/prefs/public/pref_change_registrar.h" +#include "base/prefs/pref_change_registrar.h" #include "chrome/browser/ui/search/instant_controller.h" #include "chrome/browser/ui/search/instant_unload_handler.h" #include "chrome/browser/ui/search/search_model_observer.h" diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge.h b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge.h index 9b9ef1c..43d07cc 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge.h +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge.h @@ -13,7 +13,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "base/prefs/public/pref_change_registrar.h" +#include "base/prefs/pref_change_registrar.h" #include "chrome/browser/bookmarks/bookmark_model_observer.h" class Profile; diff --git a/chrome/browser/ui/cocoa/extensions/extension_action_context_menu.mm b/chrome/browser/ui/cocoa/extensions/extension_action_context_menu.mm index 56df34a..a013567 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_action_context_menu.mm +++ b/chrome/browser/ui/cocoa/extensions/extension_action_context_menu.mm @@ -4,8 +4,8 @@ #import "chrome/browser/ui/cocoa/extensions/extension_action_context_menu.h" +#include "base/prefs/pref_change_registrar.h" #include "base/prefs/pref_service.h" -#include "base/prefs/public/pref_change_registrar.h" #include "base/sys_string_conversions.h" #include "chrome/browser/extensions/extension_action.h" #include "chrome/browser/extensions/extension_action_manager.h" diff --git a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h index 0bcfc38..edf7313 100644 --- a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h +++ b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h @@ -13,7 +13,7 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" #include "base/memory/weak_ptr.h" -#include "base/prefs/public/pref_member.h" +#include "base/prefs/pref_member.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h" #include "chrome/browser/ui/omnibox/location_bar.h" diff --git a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.h b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.h index 6ac5b72..6fdbd58 100644 --- a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.h +++ b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.h @@ -9,7 +9,7 @@ #include "base/memory/scoped_nsobject.h" #include "base/memory/scoped_ptr.h" -#include "base/prefs/public/pref_member.h" +#include "base/prefs/pref_member.h" #import "chrome/browser/ui/cocoa/command_observer_bridge.h" #import "chrome/browser/ui/cocoa/url_drop_target.h" #import "chrome/browser/ui/cocoa/view_resizer.h" diff --git a/chrome/browser/ui/gesture_prefs_observer_factory_aura.cc b/chrome/browser/ui/gesture_prefs_observer_factory_aura.cc index a5e0314..54aacab 100644 --- a/chrome/browser/ui/gesture_prefs_observer_factory_aura.cc +++ b/chrome/browser/ui/gesture_prefs_observer_factory_aura.cc @@ -9,8 +9,8 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/compiler_specific.h" +#include "base/prefs/pref_change_registrar.h" #include "base/prefs/pref_service.h" -#include "base/prefs/public/pref_change_registrar.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_dependency_manager.h" #include "chrome/common/chrome_notification_types.h" diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.h b/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.h index 27b7938..4a05975 100644 --- a/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.h +++ b/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.h @@ -13,7 +13,7 @@ #include "base/gtest_prod_util.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" -#include "base/prefs/public/pref_member.h" +#include "base/prefs/pref_member.h" #include "chrome/browser/bookmarks/bookmark_model_observer.h" #include "chrome/browser/bookmarks/bookmark_utils.h" #include "chrome/browser/ui/bookmarks/bookmark_bar.h" diff --git a/chrome/browser/ui/gtk/browser_titlebar.h b/chrome/browser/ui/gtk/browser_titlebar.h index 9a07513..5ab1c70 100644 --- a/chrome/browser/ui/gtk/browser_titlebar.h +++ b/chrome/browser/ui/gtk/browser_titlebar.h @@ -14,7 +14,7 @@ #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" -#include "base/prefs/public/pref_member.h" +#include "base/prefs/pref_member.h" #include "chrome/browser/ui/gtk/titlebar_throb_animation.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" diff --git a/chrome/browser/ui/gtk/browser_toolbar_gtk.h b/chrome/browser/ui/gtk/browser_toolbar_gtk.h index a9e5020..9c21f56 100644 --- a/chrome/browser/ui/gtk/browser_toolbar_gtk.h +++ b/chrome/browser/ui/gtk/browser_toolbar_gtk.h @@ -10,7 +10,7 @@ #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" -#include "base/prefs/public/pref_member.h" +#include "base/prefs/pref_member.h" #include "chrome/browser/command_observer.h" #include "chrome/browser/ui/gtk/custom_button.h" #include "chrome/browser/ui/gtk/menu_gtk.h" diff --git a/chrome/browser/ui/gtk/browser_window_gtk.h b/chrome/browser/ui/gtk/browser_window_gtk.h index cfdec59..d7ec966 100644 --- a/chrome/browser/ui/gtk/browser_window_gtk.h +++ b/chrome/browser/ui/gtk/browser_window_gtk.h @@ -12,7 +12,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" -#include "base/prefs/public/pref_member.h" +#include "base/prefs/pref_member.h" #include "base/timer.h" #include "build/build_config.h" #include "chrome/browser/devtools/devtools_window.h" diff --git a/chrome/browser/ui/gtk/global_menu_bar.h b/chrome/browser/ui/gtk/global_menu_bar.h index 5cc26bc..fe9ba48 100644 --- a/chrome/browser/ui/gtk/global_menu_bar.h +++ b/chrome/browser/ui/gtk/global_menu_bar.h @@ -8,7 +8,7 @@ #include <map> #include "base/compiler_specific.h" -#include "base/prefs/public/pref_change_registrar.h" +#include "base/prefs/pref_change_registrar.h" #include "chrome/browser/command_observer.h" #include "chrome/browser/ui/gtk/global_history_menu.h" #include "ui/base/gtk/gtk_signal.h" diff --git a/chrome/browser/ui/gtk/gtk_theme_service.h b/chrome/browser/ui/gtk/gtk_theme_service.h index a15df7e..f3876b1 100644 --- a/chrome/browser/ui/gtk/gtk_theme_service.h +++ b/chrome/browser/ui/gtk/gtk_theme_service.h @@ -11,7 +11,7 @@ #include "base/compiler_specific.h" #include "base/lazy_instance.h" #include "base/memory/scoped_ptr.h" -#include "base/prefs/public/pref_change_registrar.h" +#include "base/prefs/pref_change_registrar.h" #include "chrome/browser/themes/theme_service.h" #include "ui/base/glib/glib_integers.h" #include "ui/base/gtk/gtk_signal.h" diff --git a/chrome/browser/ui/gtk/location_bar_view_gtk.h b/chrome/browser/ui/gtk/location_bar_view_gtk.h index 28ab32e..98d3eda 100644 --- a/chrome/browser/ui/gtk/location_bar_view_gtk.h +++ b/chrome/browser/ui/gtk/location_bar_view_gtk.h @@ -16,7 +16,7 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" #include "base/memory/weak_ptr.h" -#include "base/prefs/public/pref_member.h" +#include "base/prefs/pref_member.h" #include "chrome/browser/extensions/extension_action.h" #include "chrome/browser/extensions/extension_action_icon_factory.h" #include "chrome/browser/extensions/extension_context_menu_model.h" diff --git a/chrome/browser/ui/prefs/prefs_tab_helper.h b/chrome/browser/ui/prefs/prefs_tab_helper.h index 5cc0995..0edc479 100644 --- a/chrome/browser/ui/prefs/prefs_tab_helper.h +++ b/chrome/browser/ui/prefs/prefs_tab_helper.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_UI_PREFS_PREFS_TAB_HELPER_H_ #include "base/compiler_specific.h" -#include "base/prefs/public/pref_change_registrar.h" +#include "base/prefs/pref_change_registrar.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/web_contents_user_data.h" diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.h b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.h index 8b5807a..816282e 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.h +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.h @@ -12,7 +12,7 @@ #include "base/compiler_specific.h" #include "base/gtest_prod_util.h" #include "base/memory/weak_ptr.h" -#include "base/prefs/public/pref_change_registrar.h" +#include "base/prefs/pref_change_registrar.h" #include "chrome/browser/bookmarks/bookmark_model_observer.h" #include "chrome/browser/bookmarks/bookmark_node_data.h" #include "chrome/browser/bookmarks/bookmark_utils.h" diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.h b/chrome/browser/ui/views/location_bar/location_bar_view.h index 345994e..3a54890 100644 --- a/chrome/browser/ui/views/location_bar/location_bar_view.h +++ b/chrome/browser/ui/views/location_bar/location_bar_view.h @@ -9,7 +9,7 @@ #include <vector> #include "base/compiler_specific.h" -#include "base/prefs/public/pref_member.h" +#include "base/prefs/pref_member.h" #include "chrome/browser/extensions/extension_context_menu_model.h" #include "chrome/browser/search_engines/template_url_service_observer.h" #include "chrome/browser/ui/omnibox/location_bar.h" diff --git a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.h b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.h index 37e02c5..01daba1 100644 --- a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.h +++ b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.h @@ -7,7 +7,7 @@ #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" -#include "base/prefs/public/pref_change_registrar.h" +#include "base/prefs/pref_change_registrar.h" #include "chrome/browser/ui/tabs/hover_tab_selector.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/browser/ui/views/tabs/tab_strip_controller.h" diff --git a/chrome/browser/ui/views/toolbar_view.h b/chrome/browser/ui/views/toolbar_view.h index 9edf31e..5fe658f 100644 --- a/chrome/browser/ui/views/toolbar_view.h +++ b/chrome/browser/ui/views/toolbar_view.h @@ -10,7 +10,7 @@ #include "base/memory/scoped_ptr.h" #include "base/observer_list.h" -#include "base/prefs/public/pref_member.h" +#include "base/prefs/pref_member.h" #include "chrome/browser/command_observer.h" #include "chrome/browser/ui/toolbar/back_forward_menu_model.h" #include "chrome/browser/ui/views/location_bar/location_bar_view.h" diff --git a/chrome/browser/ui/webui/extensions/extension_settings_handler.h b/chrome/browser/ui/webui/extensions/extension_settings_handler.h index ef09acb..f14341f 100644 --- a/chrome/browser/ui/webui/extensions/extension_settings_handler.h +++ b/chrome/browser/ui/webui/extensions/extension_settings_handler.h @@ -10,7 +10,7 @@ #include <vector> #include "base/memory/scoped_ptr.h" -#include "base/prefs/public/pref_change_registrar.h" +#include "base/prefs/pref_change_registrar.h" #include "base/scoped_observer.h" #include "chrome/browser/extensions/extension_install_prompt.h" #include "chrome/browser/extensions/extension_install_ui.h" diff --git a/chrome/browser/ui/webui/net_internals/net_internals_ui.cc b/chrome/browser/ui/webui/net_internals/net_internals_ui.cc index 4f82a4d..b1177fc 100644 --- a/chrome/browser/ui/webui/net_internals/net_internals_ui.cc +++ b/chrome/browser/ui/webui/net_internals/net_internals_ui.cc @@ -19,7 +19,7 @@ #include "base/memory/weak_ptr.h" #include "base/message_loop.h" #include "base/platform_file.h" -#include "base/prefs/public/pref_member.h" +#include "base/prefs/pref_member.h" #include "base/sequenced_task_runner_helpers.h" #include "base/string_piece.h" #include "base/string_util.h" diff --git a/chrome/browser/ui/webui/ntp/app_launcher_handler.h b/chrome/browser/ui/webui/ntp/app_launcher_handler.h index e7c6a43a..81e992d 100644 --- a/chrome/browser/ui/webui/ntp/app_launcher_handler.h +++ b/chrome/browser/ui/webui/ntp/app_launcher_handler.h @@ -9,7 +9,7 @@ #include <string> #include "base/memory/scoped_ptr.h" -#include "base/prefs/public/pref_change_registrar.h" +#include "base/prefs/pref_change_registrar.h" #include "chrome/browser/extensions/extension_uninstall_dialog.h" #include "chrome/browser/favicon/favicon_service.h" #include "chrome/browser/ui/extensions/extension_enable_flow_delegate.h" diff --git a/chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.h b/chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.h index 4c10eb6..1e43a42 100644 --- a/chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.h +++ b/chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.h @@ -7,7 +7,7 @@ #include <string> -#include "base/prefs/public/pref_change_registrar.h" +#include "base/prefs/pref_change_registrar.h" #include "chrome/browser/sync/profile_sync_service.h" #include "chrome/browser/sync/sync_ui_util.h" #include "content/public/browser/web_ui_message_handler.h" diff --git a/chrome/browser/ui/webui/ntp/new_tab_ui.h b/chrome/browser/ui/webui/ntp/new_tab_ui.h index a66a4d6..859bd64f7 100644 --- a/chrome/browser/ui/webui/ntp/new_tab_ui.h +++ b/chrome/browser/ui/webui/ntp/new_tab_ui.h @@ -8,7 +8,7 @@ #include <string> #include "base/gtest_prod_util.h" -#include "base/prefs/public/pref_change_registrar.h" +#include "base/prefs/pref_change_registrar.h" #include "base/time.h" #include "base/timer.h" #include "content/public/browser/notification_observer.h" diff --git a/chrome/browser/ui/webui/ntp/ntp_login_handler.h b/chrome/browser/ui/webui/ntp/ntp_login_handler.h index 96f11a1..aff3311 100644 --- a/chrome/browser/ui/webui/ntp/ntp_login_handler.h +++ b/chrome/browser/ui/webui/ntp/ntp_login_handler.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_NTP_NTP_LOGIN_HANDLER_H_ #define CHROME_BROWSER_UI_WEBUI_NTP_NTP_LOGIN_HANDLER_H_ -#include "base/prefs/public/pref_member.h" +#include "base/prefs/pref_member.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/web_ui_message_handler.h" diff --git a/chrome/browser/ui/webui/ntp/ntp_resource_cache.h b/chrome/browser/ui/webui/ntp/ntp_resource_cache.h index 6ca9cac..cee7e0e 100644 --- a/chrome/browser/ui/webui/ntp/ntp_resource_cache.h +++ b/chrome/browser/ui/webui/ntp/ntp_resource_cache.h @@ -8,7 +8,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/memory/ref_counted.h" -#include "base/prefs/public/pref_change_registrar.h" +#include "base/prefs/pref_change_registrar.h" #include "base/string16.h" #include "chrome/browser/profiles/profile_keyed_service.h" #include "content/public/browser/notification_observer.h" diff --git a/chrome/browser/ui/webui/options/browser_options_handler.h b/chrome/browser/ui/webui/options/browser_options_handler.h index 36e555d..7da8aeb 100644 --- a/chrome/browser/ui/webui/options/browser_options_handler.h +++ b/chrome/browser/ui/webui/options/browser_options_handler.h @@ -8,7 +8,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" -#include "base/prefs/public/pref_member.h" +#include "base/prefs/pref_member.h" #include "chrome/browser/printing/cloud_print/cloud_print_setup_handler.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/search_engines/template_url_service_observer.h" @@ -21,7 +21,7 @@ #if defined(OS_CHROMEOS) #include "chrome/browser/chromeos/system/pointer_device_observer.h" #else -#include "base/prefs/public/pref_change_registrar.h" +#include "base/prefs/pref_change_registrar.h" #endif // defined(OS_CHROMEOS) class AutocompleteController; diff --git a/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc index f8069b8..b50afac 100644 --- a/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc +++ b/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc @@ -7,7 +7,7 @@ #include <string> #include "base/bind.h" -#include "base/prefs/public/pref_change_registrar.h" +#include "base/prefs/pref_change_registrar.h" #include "base/string_util.h" #include "base/strings/string_number_conversions.h" #include "base/utf_string_conversions.h" diff --git a/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.h b/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.h index 7612611..6a76e62 100644 --- a/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.h +++ b/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.h @@ -7,7 +7,7 @@ #include "base/compiler_specific.h" #include "base/memory/weak_ptr.h" -#include "base/prefs/public/pref_change_registrar.h" +#include "base/prefs/pref_change_registrar.h" #include "chrome/browser/ui/webui/options/core_options_handler.h" namespace chromeos { diff --git a/chrome/browser/ui/webui/options/chromeos/keyboard_handler.h b/chrome/browser/ui/webui/options/chromeos/keyboard_handler.h index fcf6b2b..f01d34a 100644 --- a/chrome/browser/ui/webui/options/chromeos/keyboard_handler.h +++ b/chrome/browser/ui/webui/options/chromeos/keyboard_handler.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_KEYBOARD_HANDLER_H_ #include "base/compiler_specific.h" -#include "base/prefs/public/pref_member.h" +#include "base/prefs/pref_member.h" #include "chrome/browser/ui/webui/options/options_ui.h" namespace chromeos { diff --git a/chrome/browser/ui/webui/options/chromeos/pointer_handler.h b/chrome/browser/ui/webui/options/chromeos/pointer_handler.h index 5360dce..10af569 100644 --- a/chrome/browser/ui/webui/options/chromeos/pointer_handler.h +++ b/chrome/browser/ui/webui/options/chromeos/pointer_handler.h @@ -7,7 +7,7 @@ #include "base/compiler_specific.h" #include "base/memory/weak_ptr.h" -#include "base/prefs/public/pref_member.h" +#include "base/prefs/pref_member.h" #include "chrome/browser/chromeos/system/pointer_device_observer.h" #include "chrome/browser/ui/webui/options/options_ui.h" diff --git a/chrome/browser/ui/webui/options/clear_browser_data_handler.h b/chrome/browser/ui/webui/options/clear_browser_data_handler.h index 1de36cb..3aa34cb 100644 --- a/chrome/browser/ui/webui/options/clear_browser_data_handler.h +++ b/chrome/browser/ui/webui/options/clear_browser_data_handler.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_CLEAR_BROWSER_DATA_HANDLER_H_ #define CHROME_BROWSER_UI_WEBUI_OPTIONS_CLEAR_BROWSER_DATA_HANDLER_H_ -#include "base/prefs/public/pref_member.h" +#include "base/prefs/pref_member.h" #include "chrome/browser/browsing_data/browsing_data_remover.h" #include "chrome/browser/ui/webui/options/options_ui.h" diff --git a/chrome/browser/ui/webui/options/content_settings_handler.h b/chrome/browser/ui/webui/options/content_settings_handler.h index 7c7d32a..6d4f3b1 100644 --- a/chrome/browser/ui/webui/options/content_settings_handler.h +++ b/chrome/browser/ui/webui/options/content_settings_handler.h @@ -8,7 +8,7 @@ #include <string> #include "base/memory/scoped_ptr.h" -#include "base/prefs/public/pref_change_registrar.h" +#include "base/prefs/pref_change_registrar.h" #include "chrome/browser/pepper_flash_settings_manager.h" #include "chrome/browser/ui/webui/options/options_ui.h" #include "chrome/browser/ui/webui/options/pepper_flash_content_settings_utils.h" diff --git a/chrome/browser/ui/webui/options/core_options_handler.h b/chrome/browser/ui/webui/options/core_options_handler.h index bd01a7e..0808447 100644 --- a/chrome/browser/ui/webui/options/core_options_handler.h +++ b/chrome/browser/ui/webui/options/core_options_handler.h @@ -9,8 +9,8 @@ #include <string> #include "base/callback.h" +#include "base/prefs/pref_change_registrar.h" #include "base/prefs/pref_service.h" -#include "base/prefs/public/pref_change_registrar.h" #include "base/values.h" #include "chrome/browser/plugins/plugin_status_pref_setter.h" #include "chrome/browser/ui/webui/options/options_ui.h" diff --git a/chrome/browser/ui/webui/options/font_settings_handler.h b/chrome/browser/ui/webui/options/font_settings_handler.h index 67b5e04..32ca8c4 100644 --- a/chrome/browser/ui/webui/options/font_settings_handler.h +++ b/chrome/browser/ui/webui/options/font_settings_handler.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_UI_WEBUI_OPTIONS_FONT_SETTINGS_HANDLER_H_ #include "base/memory/scoped_ptr.h" -#include "base/prefs/public/pref_member.h" +#include "base/prefs/pref_member.h" #include "chrome/browser/ui/webui/options/options_ui.h" namespace base { diff --git a/chrome/browser/ui/webui/options/managed_user_settings_handler.h b/chrome/browser/ui/webui/options/managed_user_settings_handler.h index 3134139..c83ed85 100644 --- a/chrome/browser/ui/webui/options/managed_user_settings_handler.h +++ b/chrome/browser/ui/webui/options/managed_user_settings_handler.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_MANAGED_USER_SETTINGS_HANDLER_H_ #define CHROME_BROWSER_UI_WEBUI_OPTIONS_MANAGED_USER_SETTINGS_HANDLER_H_ -#include "base/prefs/public/pref_change_registrar.h" +#include "base/prefs/pref_change_registrar.h" #include "base/time.h" #include "base/values.h" #include "chrome/browser/ui/webui/options/options_ui.h" diff --git a/chrome/browser/ui/webui/options/media_galleries_handler.h b/chrome/browser/ui/webui/options/media_galleries_handler.h index 451adc0..441e736 100644 --- a/chrome/browser/ui/webui/options/media_galleries_handler.h +++ b/chrome/browser/ui/webui/options/media_galleries_handler.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_UI_WEBUI_OPTIONS_MEDIA_GALLERIES_HANDLER_H_ #include "base/memory/ref_counted.h" -#include "base/prefs/public/pref_change_registrar.h" +#include "base/prefs/pref_change_registrar.h" #include "chrome/browser/ui/webui/options/options_ui.h" #include "content/public/browser/notification_observer.h" #include "ui/shell_dialogs/select_file_dialog.h" diff --git a/chrome/browser/ui/webui/options/password_manager_handler.h b/chrome/browser/ui/webui/options/password_manager_handler.h index f261e0a..22de6d6 100644 --- a/chrome/browser/ui/webui/options/password_manager_handler.h +++ b/chrome/browser/ui/webui/options/password_manager_handler.h @@ -9,7 +9,7 @@ #include <vector> #include "base/memory/scoped_vector.h" -#include "base/prefs/public/pref_member.h" +#include "base/prefs/pref_member.h" #include "chrome/browser/password_manager/password_store.h" #include "chrome/browser/password_manager/password_store_consumer.h" #include "chrome/browser/ui/webui/options/options_ui.h" diff --git a/chrome/browser/ui/webui/options/preferences_browsertest.h b/chrome/browser/ui/webui/options/preferences_browsertest.h index e118056..3d5fb21 100644 --- a/chrome/browser/ui/webui/options/preferences_browsertest.h +++ b/chrome/browser/ui/webui/options/preferences_browsertest.h @@ -10,8 +10,8 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/prefs/pref_change_registrar.h" #include "base/prefs/pref_service.h" -#include "base/prefs/public/pref_change_registrar.h" #include "chrome/browser/policy/mock_configuration_policy_provider.h" #include "chrome/browser/policy/policy_types.h" #include "chrome/test/base/in_process_browser_test.h" diff --git a/chrome/browser/ui/webui/options/startup_pages_handler.h b/chrome/browser/ui/webui/options/startup_pages_handler.h index f6b718e..aeea059 100644 --- a/chrome/browser/ui/webui/options/startup_pages_handler.h +++ b/chrome/browser/ui/webui/options/startup_pages_handler.h @@ -8,8 +8,8 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" -#include "base/prefs/public/pref_change_registrar.h" -#include "base/prefs/public/pref_member.h" +#include "base/prefs/pref_change_registrar.h" +#include "base/prefs/pref_member.h" #include "chrome/browser/autocomplete/autocomplete_controller_delegate.h" #include "chrome/browser/ui/webui/options/options_ui.h" #include "ui/base/models/table_model_observer.h" diff --git a/chrome/browser/ui/webui/plugins_ui.cc b/chrome/browser/ui/webui/plugins_ui.cc index 1cef447..fee7028 100644 --- a/chrome/browser/ui/webui/plugins_ui.cc +++ b/chrome/browser/ui/webui/plugins_ui.cc @@ -16,8 +16,8 @@ #include "base/memory/weak_ptr.h" #include "base/message_loop.h" #include "base/path_service.h" +#include "base/prefs/pref_member.h" #include "base/prefs/pref_service.h" -#include "base/prefs/public/pref_member.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/content_settings/host_content_settings_map.h" diff --git a/chrome/browser/ui/zoom/zoom_controller.h b/chrome/browser/ui/zoom/zoom_controller.h index a038b5f..c63234d 100644 --- a/chrome/browser/ui/zoom/zoom_controller.h +++ b/chrome/browser/ui/zoom/zoom_controller.h @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "base/prefs/public/pref_member.h" +#include "base/prefs/pref_member.h" #include "content/public/browser/host_zoom_map.h" #include "content/public/browser/web_contents_observer.h" #include "content/public/browser/web_contents_user_data.h" diff --git a/components/autofill/browser/autocomplete_history_manager.h b/components/autofill/browser/autocomplete_history_manager.h index 7699557..fc70e85 100644 --- a/components/autofill/browser/autocomplete_history_manager.h +++ b/components/autofill/browser/autocomplete_history_manager.h @@ -8,7 +8,7 @@ #include <vector> #include "base/gtest_prod_util.h" -#include "base/prefs/public/pref_member.h" +#include "base/prefs/pref_member.h" #include "chrome/browser/api/webdata/autofill_web_data_service.h" #include "chrome/browser/api/webdata/web_data_service_consumer.h" #include "content/public/browser/web_contents_observer.h" diff --git a/components/autofill/browser/autofill_manager.h b/components/autofill/browser/autofill_manager.h index eb8f38b..4442e2f 100644 --- a/components/autofill/browser/autofill_manager.h +++ b/components/autofill/browser/autofill_manager.h @@ -17,7 +17,7 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" #include "base/memory/weak_ptr.h" -#include "base/prefs/public/pref_change_registrar.h" +#include "base/prefs/pref_change_registrar.h" #include "base/string16.h" #include "base/supports_user_data.h" #include "base/time.h" |