Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser.cc |
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser.cc |
index e900163c784ef8b55e735a46b0e8e258fa9a0ca3..1820ab9a2e4ac5835907578fb28191166aa8e918 100644 |
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser.cc |
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser.cc |
@@ -186,7 +186,7 @@ std::string GetPrefForRootWindow(PrefService* pref_service, |
// If prefs have synced and no user-set value exists at |local_path|, the value |
// from |synced_path| is copied to |local_path|. |
-void MaybePropagatePrefToLocal(PrefService* pref_service, |
+void MaybePropagatePrefToLocal(PrefServiceSyncable* pref_service, |
const char* local_path, |
const char* synced_path) { |
if (!pref_service->FindPreference(local_path)->HasUserSetting() && |
@@ -275,7 +275,7 @@ void ChromeLauncherControllerPerBrowser::Init() { |
if (ash::Shell::HasInstance()) { |
SetShelfAutoHideBehaviorFromPrefs(); |
SetShelfAlignmentFromPrefs(); |
- PrefService* prefs = profile_->GetPrefs(); |
+ PrefServiceSyncable* prefs = profile_->GetPrefs(); |
if (!prefs->FindPreference(prefs::kShelfAlignmentLocal)->HasUserSetting() || |
!prefs->FindPreference(prefs::kShelfAutoHideBehaviorLocal)-> |
HasUserSetting()) { |