Delay forcing natural scroll setting until after initial sync.

chrome/browser/chromeos/preferences.h

Index: chrome/browser/chromeos/preferences.h
===================================================================
--- chrome/browser/chromeos/preferences.h	(revision 173817)
+++ chrome/browser/chromeos/preferences.h	(working copy)
@@ -11,6 +11,7 @@
 #include "base/compiler_specific.h"
 #include "base/prefs/public/pref_member.h"
 #include "chrome/browser/chromeos/language_preferences.h"
+#include "chrome/browser/prefs/pref_service_observer.h"
 
 class PrefService;
 
@@ -23,7 +24,7 @@
 // is first initialized, it will initialize the OS settings to what's stored in
 // the preferences. These include touchpad settings, etc.
 // When the preferences change, we change the settings to reflect the new value.
-class Preferences {
+class Preferences : public PrefServiceObserver {
  public:
   Preferences();
   explicit Preferences(
@@ -90,6 +91,13 @@
   // underlying XKB API requires it.
   void UpdateAutoRepeatRate();
 
+  // PrefServiceObserver implementation.
+  virtual void OnIsSyncingChanged() OVERRIDE;

[xiyuan, 2012/12/20 01:44:28]

nit: keep virtual methods after non-virtual ones.

[achuithb, 2012/12/20 01:53:31]

Done.

+
+  // Force natural scroll to on if --enable-natural-scroll-default is specified
+  // on the cmd line.
+  void ForceNaturalScrollDefault();
+
   PrefService* prefs_;
 
   input_method::InputMethodManager* input_method_manager_;