| Index: chrome/browser/chromeos/preferences.cc
|
| diff --git a/chrome/browser/chromeos/preferences.cc b/chrome/browser/chromeos/preferences.cc
|
| index 1aefed47e739dd5d06e98227f90b91108a8ad384..d62aa6c73579848cd54734920c168a3848586fd2 100644
|
| --- a/chrome/browser/chromeos/preferences.cc
|
| +++ b/chrome/browser/chromeos/preferences.cc
|
| @@ -101,7 +101,7 @@ void Preferences::RegisterUserPrefs(
|
| registry->RegisterBooleanPref(
|
| prefs::kNaturalScroll,
|
| CommandLine::ForCurrentProcess()->HasSwitch(
|
| - ::switches::kNaturalScrollDefault),
|
| + switches::kNaturalScrollDefault),
|
| user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
|
| registry->RegisterBooleanPref(
|
| prefs::kPrimaryMouseButtonRight,
|
| @@ -881,7 +881,7 @@ void Preferences::OnIsSyncingChanged() {
|
| void Preferences::ForceNaturalScrollDefault() {
|
| DVLOG(1) << "ForceNaturalScrollDefault";
|
| if (CommandLine::ForCurrentProcess()->HasSwitch(
|
| - ::switches::kNaturalScrollDefault) &&
|
| + switches::kNaturalScrollDefault) &&
|
| prefs_->IsSyncing() &&
|
| !prefs_->GetUserPrefValue(prefs::kNaturalScroll)) {
|
| DVLOG(1) << "Natural scroll forced to true";
|
|
|