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

chrome/browser/profile.h

 // 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.
 
 // This class gathers state related to a single user profile.
 
 #ifndef CHROME_BROWSER_PROFILE_H_
 #define CHROME_BROWSER_PROFILE_H_
 
 #include <set>
 #include <string>
 
 #include "app/theme_provider.h"
 #include "base/basictypes.h"
 #include "base/file_path.h"
 #include "base/scoped_ptr.h"
 #include "base/timer.h"
 #include "chrome/browser/web_resource/web_resource_service.h"
 #include "chrome/common/notification_registrar.h"
 
+#if defined(OS_CHROMEOS)
+#include "chrome/browser/chromeos/touchpad.h"
+#endif
+
 namespace net {
 class StrictTransportSecurityState;
 class SSLConfigService;
 }
 class Blacklist;
 class BookmarkModel;
 class BrowserThemeProvider;
 class ChromeAppCacheService;
 class ChromeURLRequestContext;
 class DownloadManager;
@@ skipping 483 matching lines @@
   scoped_refptr<TabRestoreService> tab_restore_service_;
 
   // This can not be a scoped_refptr because we must release it on the I/O
   // thread.
   SpellChecker* spellchecker_;
 
   // Set to true when ShutdownSessionService is invoked. If true
   // GetSessionService won't recreate the SessionService.
   bool shutdown_session_service_;
 
+#if defined(OS_CHROMEOS)
+  Touchpad touchpad_;
+#endif
+
   DISALLOW_COPY_AND_ASSIGN(ProfileImpl);
 };
 
 #if defined(COMPILER_GCC)
 namespace __gnu_cxx {
 
 template<>
 struct hash<Profile*> {
   std::size_t operator()(Profile* const& p) const {
     return reinterpret_cast<std::size_t>(p);
   }
 };
 
 }  // namespace __gnu_cxx
 #endif
 
 // This struct is used to pass the spellchecker object through the notification
 // NOTIFY_SPELLCHECKER_REINITIALIZED. This is used as the details for the
 // notification service.
 struct SpellcheckerReinitializedDetails {
   scoped_refptr<SpellChecker> spellchecker;
 };
 
 #endif  // CHROME_BROWSER_PROFILE_H_