| Index: chrome/browser/chromeos/preferences.cc
|
| ===================================================================
|
| --- chrome/browser/chromeos/preferences.cc (revision 169466)
|
| +++ chrome/browser/chromeos/preferences.cc (working copy)
|
| @@ -77,9 +77,11 @@
|
| prefs->RegisterBooleanPref(prefs::kEnableTouchpadThreeFingerSwipe,
|
| false,
|
| PrefService::UNSYNCABLE_PREF);
|
| - prefs->RegisterBooleanPref(prefs::kNaturalScroll,
|
| - false,
|
| - PrefService::SYNCABLE_PREF);
|
| + prefs->RegisterBooleanPref(
|
| + prefs::kNaturalScroll,
|
| + CommandLine::ForCurrentProcess()->HasSwitch(
|
| + switches::kNaturalScrollDefault),
|
| + PrefService::SYNCABLE_PREF);
|
| prefs->RegisterBooleanPref(prefs::kPrimaryMouseButtonRight,
|
| false,
|
| PrefService::SYNCABLE_PREF);
|
|
|