Added ChromeOS settings for touchpad

chrome/browser/profile.cc

Index: chrome/browser/profile.cc
===================================================================
--- chrome/browser/profile.cc	(revision 26107)
+++ chrome/browser/profile.cc	(working copy)
@@ -57,6 +57,10 @@
 #include "chrome/browser/gtk/gtk_theme_provider.h"
 #endif
 
+#if defined(OS_CHROMEOS)
+#include "chrome/browser/chromeos/touchpad.h"
+#endif
+
 using base::Time;
 using base::TimeDelta;
 
@@ -596,6 +600,10 @@
 
   ssl_config_service_manager_.reset(
       SSLConfigServiceManager::CreateDefaultManager(this));
+
+#if defined(OS_CHROMEOS)
+  touchpad_.Init(prefs);
+#endif
 }
 
 void ProfileImpl::InitExtensions() {
@@ -847,6 +855,12 @@
     // register known prefs as soon as possible.
     Profile::RegisterUserPrefs(prefs_.get());
     ProfileManager::RegisterUserPrefs(prefs_.get());
+#if defined(OS_CHROMEOS)
+    // Register Touchpad prefs here instead of in browser_prefs because these
+    // prefs are used in the constructor of ProfileImpl which happens before
+    // browser_prefs' RegisterAllPrefs is called.
+    Touchpad::RegisterUserPrefs(prefs_.get());
+#endif
 
     // The last session exited cleanly if there is no pref for
     // kSessionExitedCleanly or the value for kSessionExitedCleanly is true.