diff options
Diffstat (limited to 'chrome/browser/chromeos')
6 files changed, 7 insertions, 8 deletions
diff --git a/chrome/browser/chromeos/audio/audio_handler.h b/chrome/browser/chromeos/audio/audio_handler.h index 1b348eb..ecb9f57a 100644 --- a/chrome/browser/chromeos/audio/audio_handler.h +++ b/chrome/browser/chromeos/audio/audio_handler.h @@ -6,10 +6,10 @@ #define CHROME_BROWSER_CHROMEOS_AUDIO_AUDIO_HANDLER_H_ #include "base/basictypes.h" -#include "base/observer_list.h" #include "base/memory/scoped_ptr.h" +#include "base/observer_list.h" +#include "base/prefs/public/pref_change_registrar.h" #include "base/threading/thread.h" -#include "chrome/browser/api/prefs/pref_change_registrar.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" diff --git a/chrome/browser/chromeos/drive/drive_file_system.cc b/chrome/browser/chromeos/drive/drive_file_system.cc index e6257a3..9a764d4 100644 --- a/chrome/browser/chromeos/drive/drive_file_system.cc +++ b/chrome/browser/chromeos/drive/drive_file_system.cc @@ -10,10 +10,10 @@ #include "base/message_loop_proxy.h" #include "base/metrics/histogram.h" #include "base/platform_file.h" +#include "base/prefs/public/pref_change_registrar.h" #include "base/stringprintf.h" #include "base/threading/sequenced_worker_pool.h" #include "base/values.h" -#include "chrome/browser/api/prefs/pref_change_registrar.h" #include "chrome/browser/chromeos/drive/drive.pb.h" #include "chrome/browser/chromeos/drive/drive_feed_loader.h" #include "chrome/browser/chromeos/drive/drive_feed_processor.h" diff --git a/chrome/browser/chromeos/drive/drive_sync_client.cc b/chrome/browser/chromeos/drive/drive_sync_client.cc index cf06ed6..d3b2617 100644 --- a/chrome/browser/chromeos/drive/drive_sync_client.cc +++ b/chrome/browser/chromeos/drive/drive_sync_client.cc @@ -9,7 +9,7 @@ #include "base/bind.h" #include "base/message_loop_proxy.h" -#include "chrome/browser/api/prefs/pref_change_registrar.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/chromeos/drive/drive_file_system_util.h" diff --git a/chrome/browser/chromeos/extensions/file_browser_event_router.cc b/chrome/browser/chromeos/extensions/file_browser_event_router.cc index 5b54564..715ad8a 100644 --- a/chrome/browser/chromeos/extensions/file_browser_event_router.cc +++ b/chrome/browser/chromeos/extensions/file_browser_event_router.cc @@ -7,9 +7,9 @@ #include "base/bind.h" #include "base/json/json_writer.h" #include "base/message_loop.h" +#include "base/prefs/public/pref_change_registrar.h" #include "base/stl_util.h" #include "base/values.h" -#include "chrome/browser/api/prefs/pref_change_registrar.h" #include "chrome/browser/chromeos/cros/cros_library.h" #include "chrome/browser/chromeos/drive/drive_file_system_interface.h" #include "chrome/browser/chromeos/drive/drive_file_system_util.h" diff --git a/chrome/browser/chromeos/settings/device_settings_provider.h b/chrome/browser/chromeos/settings/device_settings_provider.h index cf625df..f834d4e 100644 --- a/chrome/browser/chromeos/settings/device_settings_provider.h +++ b/chrome/browser/chromeos/settings/device_settings_provider.h @@ -14,11 +14,10 @@ #include "base/callback_forward.h" #include "base/gtest_prod_util.h" #include "base/memory/weak_ptr.h" +#include "base/prefs/pref_value_map.h" #include "chrome/browser/chromeos/settings/cros_settings_provider.h" #include "chrome/browser/chromeos/settings/device_settings_service.h" #include "chrome/browser/policy/proto/chrome_device_policy.pb.h" -#include "chrome/browser/prefs/pref_value_map.h" -#include "chrome/browser/prefs/pref_value_map.h" namespace base { class Value; diff --git a/chrome/browser/chromeos/settings/stub_cros_settings_provider.h b/chrome/browser/chromeos/settings/stub_cros_settings_provider.h index 9d88bf7..92a9a8d 100644 --- a/chrome/browser/chromeos/settings/stub_cros_settings_provider.h +++ b/chrome/browser/chromeos/settings/stub_cros_settings_provider.h @@ -7,8 +7,8 @@ #include <string> +#include "base/prefs/pref_value_map.h" #include "chrome/browser/chromeos/settings/cros_settings_provider.h" -#include "chrome/browser/prefs/pref_value_map.h" namespace chromeos { |