diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-15 20:21:53 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-15 20:21:53 +0000 |
| commit | 2627431bef905332e55a90960aed8049b681689f (patch) | |
| tree | 4d15c42eb95a48241e2bc9a109bbb77c3eafad00 /chrome/browser/profile.h | |
| parent | d328413b739ed1150369743a64cacfb167086a32 (diff) | |
| download | chromium_src-2627431bef905332e55a90960aed8049b681689f.zip chromium_src-2627431bef905332e55a90960aed8049b681689f.tar.gz chromium_src-2627431bef905332e55a90960aed8049b681689f.tar.bz2 | |
Lands http://codereview.chromium.org/193032 for Charlie:
First pass at adding ChromeOS settings
- a mock wifi selector combobox
- touchpad settings that makes calls to synclient
- on startup, touchpad settings are initialized to what's stored in
preferences
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/203073
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26259 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/profile.h')
| -rw-r--r-- | chrome/browser/profile.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/chrome/browser/profile.h b/chrome/browser/profile.h index 1769ec8..ba4dd87 100644 --- a/chrome/browser/profile.h +++ b/chrome/browser/profile.h @@ -18,6 +18,10 @@ #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; @@ -521,6 +525,10 @@ class ProfileImpl : public Profile, // GetSessionService won't recreate the SessionService. bool shutdown_session_service_; +#if defined(OS_CHROMEOS) + Touchpad touchpad_; +#endif + DISALLOW_COPY_AND_ASSIGN(ProfileImpl); }; |