Lands http://codereview.chromium.org/193032 for Charlie:...

chrome/browser/profile.cc

 // Copyright (c) 2006-2008 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.
 
 #include "chrome/browser/profile.h"
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/path_service.h"
 #include "base/scoped_ptr.h"
@@ skipping 39 matching lines @@
 #include "chrome/common/pref_names.h"
 #include "chrome/common/render_messages.h"
 #include "grit/locale_settings.h"
 #include "net/base/strict_transport_security_state.h"
 
 #if defined(OS_LINUX)
 #include "net/ocsp/nss_ocsp.h"
 #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;
 
 namespace {
 
 // Delay, in milliseconds, before we explicitly create the SessionService.
 static const int kCreateSessionServiceDelayMS = 500;
 
 enum ContextType {
   kNormalContext,
@@ skipping 519 matching lines @@
   // Listen for theme installation.
   registrar_.Add(this, NotificationType::THEME_INSTALLED,
                  NotificationService::AllSources());
 
   // Listen for bookmark model load, to bootstrap the sync service.
   registrar_.Add(this, NotificationType::BOOKMARK_MODEL_LOADED,
                  Source<Profile>(this));
 
   ssl_config_service_manager_.reset(
       SSLConfigServiceManager::CreateDefaultManager(this));
+
+#if defined(OS_CHROMEOS)
+  touchpad_.Init(prefs);
+#endif
 }
 
 void ProfileImpl::InitExtensions() {
   if (user_script_master_ || extensions_service_)
     return;  // Already initialized.
 
   const CommandLine* command_line = CommandLine::ForCurrentProcess();
   PrefService* prefs = GetPrefs();
   bool user_scripts_enabled =
       command_line->HasSwitch(switches::kEnableUserScripts) ||
@@ skipping 231 matching lines @@
 
 PrefService* ProfileImpl::GetPrefs() {
   if (!prefs_.get()) {
     prefs_.reset(new PrefService(GetPrefFilePath(),
                                  g_browser_process->file_thread()));
 
     // The Profile class and ProfileManager class may read some prefs so
     // 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.
     last_session_exited_cleanly_ =
         prefs_->GetBoolean(prefs::kSessionExitedCleanly);
     // Mark the session as open.
     prefs_->SetBoolean(prefs::kSessionExitedCleanly, false);
     // Make sure we save to disk that the session has opened.
     prefs_->ScheduleSavePersistentPrefs();
   }
@@ skipping 461 matching lines @@
 #endif
   return NULL;
 }
 
 void ProfileImpl::InitSyncService() {
 #ifdef CHROME_PERSONALIZATION
   sync_service_.reset(new ProfileSyncService(this));
   sync_service_->Initialize();
 #endif
 }