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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 52223002: Revert 231699 "Remove kNaturalScrollDefault." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 2 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
« no previous file with comments | « trunk/src/chrome/browser/chromeos/login/login_display_host_impl.cc ('k') | trunk/src/chrome/browser/ui/views/ash/tab_scrubber_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/chrome/browser/chromeos/preferences.cc
===================================================================
--- trunk/src/chrome/browser/chromeos/preferences.cc (revision 231778)
+++ trunk/src/chrome/browser/chromeos/preferences.cc (working copy)
@@ -116,7 +116,8 @@
user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
registry->RegisterBooleanPref(
prefs::kNaturalScroll,
- ui::ShouldDefaultToNaturalScroll(),
+ CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kNaturalScrollDefault),
user_prefs::PrefRegistrySyncable::SYNCABLE_PRIORITY_PREF);
registry->RegisterBooleanPref(
prefs::kPrimaryMouseButtonRight,
@@ -585,7 +586,8 @@
void Preferences::ForceNaturalScrollDefault() {
DVLOG(1) << "ForceNaturalScrollDefault";
- if (ui::ShouldDefaultToNaturalScroll() &&
+ if (CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kNaturalScrollDefault) &&
prefs_->IsSyncing() &&
!prefs_->GetUserPrefValue(prefs::kNaturalScroll)) {
DVLOG(1) << "Natural scroll forced to true";
« no previous file with comments | « trunk/src/chrome/browser/chromeos/login/login_display_host_impl.cc ('k') | trunk/src/chrome/browser/ui/views/ash/tab_scrubber_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698