summaryrefslogtreecommitdiffstats
path: root/chrome/browser/profile.h
diff options
context:
space:
mode:
authorchocobo@google.com <chocobo@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-15 21:08:29 +0000
committerchocobo@google.com <chocobo@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-15 21:08:29 +0000
commitfecc1520c83dc037865ba49846f764ce056d4016 (patch)
tree54be637f39785fda3046ca0a276be1ceba2c9999 /chrome/browser/profile.h
parent40c2a7869363f42ab82b48bd5d4cb1a776cd2809 (diff)
downloadchromium_src-fecc1520c83dc037865ba49846f764ce056d4016.zip
chromium_src-fecc1520c83dc037865ba49846f764ce056d4016.tar.gz
chromium_src-fecc1520c83dc037865ba49846f764ce056d4016.tar.bz2
Add UI for changing timezones.
BUG=24876 TEST=none Review URL: http://codereview.chromium.org/267113 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29183 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/profile.h')
-rw-r--r--chrome/browser/profile.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/profile.h b/chrome/browser/profile.h
index a7107f4..2ab6233 100644
--- a/chrome/browser/profile.h
+++ b/chrome/browser/profile.h
@@ -18,7 +18,7 @@
#include "chrome/common/notification_registrar.h"
#if defined(OS_CHROMEOS)
-#include "chrome/browser/chromeos/touchpad.h"
+#include "chrome/browser/chromeos/preferences.h"
#endif
namespace net {
@@ -553,7 +553,7 @@ class ProfileImpl : public Profile,
bool shutdown_session_service_;
#if defined(OS_CHROMEOS)
- Touchpad touchpad_;
+ chromeos::Preferences chromeos_preferences_;
#endif
DISALLOW_COPY_AND_ASSIGN(ProfileImpl);