OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/chromeos/preferences.h" | 5 #include "chrome/browser/chromeos/preferences.h" |
6 | 6 |
7 #include <vector> | 7 #include <vector> |
8 | 8 |
9 #include "ash/autoclick/autoclick_controller.h" | 9 #include "ash/autoclick/autoclick_controller.h" |
10 #include "ash/display/display_manager.h" | 10 #include "ash/display/display_manager.h" |
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
89 | 89 |
90 // static | 90 // static |
91 void Preferences::RegisterPrefs(PrefRegistrySimple* registry) { | 91 void Preferences::RegisterPrefs(PrefRegistrySimple* registry) { |
92 registry->RegisterBooleanPref(prefs::kOwnerPrimaryMouseButtonRight, false); | 92 registry->RegisterBooleanPref(prefs::kOwnerPrimaryMouseButtonRight, false); |
93 registry->RegisterBooleanPref(prefs::kOwnerTapToClickEnabled, true); | 93 registry->RegisterBooleanPref(prefs::kOwnerTapToClickEnabled, true); |
94 registry->RegisterBooleanPref(prefs::kAccessibilityVirtualKeyboardEnabled, | 94 registry->RegisterBooleanPref(prefs::kAccessibilityVirtualKeyboardEnabled, |
95 false); | 95 false); |
96 registry->RegisterStringPref(prefs::kLogoutStartedLast, std::string()); | 96 registry->RegisterStringPref(prefs::kLogoutStartedLast, std::string()); |
97 registry->RegisterBooleanPref(prefs::kResolveDeviceTimezoneByGeolocation, | 97 registry->RegisterBooleanPref(prefs::kResolveDeviceTimezoneByGeolocation, |
98 true); | 98 true); |
| 99 registry->RegisterIntegerPref( |
| 100 prefs::kSystemTimezoneAutomaticDetectionPolicy, |
| 101 ResolveDeviceTimezoneByGeolocationPolicyValues::USERS_DECIDE); |
99 } | 102 } |
100 | 103 |
101 // static | 104 // static |
102 void Preferences::RegisterProfilePrefs( | 105 void Preferences::RegisterProfilePrefs( |
103 user_prefs::PrefRegistrySyncable* registry) { | 106 user_prefs::PrefRegistrySyncable* registry) { |
104 std::string hardware_keyboard_id; | 107 std::string hardware_keyboard_id; |
105 // TODO(yusukes): Remove the runtime hack. | 108 // TODO(yusukes): Remove the runtime hack. |
106 if (base::SysInfo::IsRunningOnChromeOS()) { | 109 if (base::SysInfo::IsRunningOnChromeOS()) { |
107 DCHECK(g_browser_process); | 110 DCHECK(g_browser_process); |
108 PrefService* local_state = g_browser_process->local_state(); | 111 PrefService* local_state = g_browser_process->local_state(); |
(...skipping 636 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
745 touch_hud_projection_enabled_.SetValue(enabled); | 748 touch_hud_projection_enabled_.SetValue(enabled); |
746 } | 749 } |
747 | 750 |
748 void Preferences::ActiveUserChanged(const user_manager::User* active_user) { | 751 void Preferences::ActiveUserChanged(const user_manager::User* active_user) { |
749 if (active_user != user_) | 752 if (active_user != user_) |
750 return; | 753 return; |
751 ApplyPreferences(REASON_ACTIVE_USER_CHANGED, ""); | 754 ApplyPreferences(REASON_ACTIVE_USER_CHANGED, ""); |
752 } | 755 } |
753 | 756 |
754 } // namespace chromeos | 757 } // namespace chromeos |
OLD | NEW |