summaryrefslogtreecommitdiffstats
path: root/chrome/browser/prefs
diff options
context:
space:
mode:
authordilmah@chromium.org <dilmah@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-16 14:31:54 +0000
committerdilmah@chromium.org <dilmah@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-16 14:31:54 +0000
commit2bb5fcdbfff5f1a78607f1f708caa241f2612a7e (patch)
tree5dfa4493e3e393fb6dbd05670289534d74b3463b /chrome/browser/prefs
parent421551607bdee875b9502d8fd74bdcf69e009fe2 (diff)
downloadchromium_src-2bb5fcdbfff5f1a78607f1f708caa241f2612a7e.zip
chromium_src-2bb5fcdbfff5f1a78607f1f708caa241f2612a7e.tar.gz
chromium_src-2bb5fcdbfff5f1a78607f1f708caa241f2612a7e.tar.bz2
Rename CrosSettingsProviderProxy -> ProxyCrosSettingsProvider
to match naming pattern of UserCrosSettingsProvider etc. reshuffle some code in more consistent way. No Functionality Change. BUG=http://crosbug.com/8645 TEST=None Review URL: http://codereview.chromium.org/5078001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66271 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/prefs')
-rw-r--r--chrome/browser/prefs/browser_prefs.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index ca75e38c..0572dbb 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -61,13 +61,13 @@
#endif
#if defined(OS_CHROMEOS)
-#include "chrome/browser/chromeos/cros_settings_provider_user.h"
#include "chrome/browser/chromeos/login/apply_services_customization.h"
#include "chrome/browser/chromeos/login/signed_settings_temp_storage.h"
#include "chrome/browser/chromeos/login/user_manager.h"
#include "chrome/browser/chromeos/login/wizard_controller.h"
#include "chrome/browser/chromeos/preferences.h"
#include "chrome/browser/chromeos/status/input_method_menu_button.h"
+#include "chrome/browser/chromeos/user_cros_settings_provider.h"
#endif
namespace browser {