Delay forcing natural scroll setting until after initial sync.

chrome/browser/chromeos/preferences.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_CHROMEOS_PREFERENCES_H_
 #define CHROME_BROWSER_CHROMEOS_PREFERENCES_H_
 
 #include <string>
 #include <vector>
 
 #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;
 
 namespace chromeos {
 namespace input_method {
 class InputMethodManager;
 }  // namespace input_method
 
 // The Preferences class handles Chrome OS preferences. When the class
 // 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(
       input_method::InputMethodManager* input_method_manager);  // for testing
   virtual ~Preferences();
 
   // This method will register the prefs associated with Chrome OS settings.
   static void RegisterUserPrefs(PrefService* prefs);
 
   // This method will initialize Chrome OS settings to values in user prefs.
@@ skipping 46 matching lines @@
                                         const std::string& value);
 
   // Restores the user's preferred input method / keyboard layout on signing in.
   void SetInputMethodList();
 
   // Updates the initial key repeat delay and key repeat interval following
   // current prefs values. We set the delay and interval at once since an
   // 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_;
 
   BooleanPrefMember tap_to_click_enabled_;
   BooleanPrefMember tap_dragging_enabled_;
   BooleanPrefMember three_finger_click_enabled_;
   BooleanPrefMember three_finger_swipe_enabled_;
   BooleanPrefMember natural_scroll_;
   BooleanPrefMember vert_edge_scroll_enabled_;
@@ skipping 45 matching lines @@
   BooleanPrefMember enable_screen_lock_;
 
   BooleanPrefMember enable_drm_;
 
   DISALLOW_COPY_AND_ASSIGN(Preferences);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_PREFERENCES_H_