Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(839)

Unified Diff: chrome/browser/chromeos/preferences.cc

Issue 33913003: Remove kNaturalScrollDefault. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/preferences.cc
diff --git a/chrome/browser/chromeos/preferences.cc b/chrome/browser/chromeos/preferences.cc
index d3a74ff3e546361a8589ac03a67ac548ce6d9a3b..81634cab00a3b3ba1dd21d0b8f44a14dcfba2fc7 100644
--- a/chrome/browser/chromeos/preferences.cc
+++ b/chrome/browser/chromeos/preferences.cc
@@ -119,8 +119,7 @@ void Preferences::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
registry->RegisterBooleanPref(
prefs::kNaturalScroll,
- CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kNaturalScrollDefault),
+ ui::ShouldDefaultToNaturalScroll(),
user_prefs::PrefRegistrySyncable::SYNCABLE_PRIORITY_PREF);
registry->RegisterBooleanPref(
prefs::kPrimaryMouseButtonRight,
@@ -565,8 +564,7 @@ void Preferences::OnIsSyncingChanged() {
void Preferences::ForceNaturalScrollDefault() {
DVLOG(1) << "ForceNaturalScrollDefault";
- if (CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kNaturalScrollDefault) &&
+ if (ui::ShouldDefaultToNaturalScroll() &&
prefs_->IsSyncing() &&
!prefs_->GetUserPrefValue(prefs::kNaturalScroll)) {
DVLOG(1) << "Natural scroll forced to true";
« no previous file with comments | « chrome/browser/chromeos/login/ui/login_display_host_impl.cc ('k') | chrome/browser/ui/views/ash/tab_scrubber_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698