diff options
Diffstat (limited to 'chrome/browser/chromeos')
12 files changed, 12 insertions, 12 deletions
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" |