| 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/shell.h" | 10 #include "ash/shell.h" |
| (...skipping 300 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 311 registry->RegisterBooleanPref( | 311 registry->RegisterBooleanPref( |
| 312 prefs::kTouchHudProjectionEnabled, | 312 prefs::kTouchHudProjectionEnabled, |
| 313 false, | 313 false, |
| 314 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | 314 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
| 315 | 315 |
| 316 registry->RegisterBooleanPref( | 316 registry->RegisterBooleanPref( |
| 317 prefs::kTouchVirtualKeyboardEnabled, | 317 prefs::kTouchVirtualKeyboardEnabled, |
| 318 false, | 318 false, |
| 319 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | 319 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
| 320 | 320 |
| 321 input_method::InputMethodSyncer::RegisterProfilePrefs(registry); |
| 322 |
| 321 registry->RegisterBooleanPref( | 323 registry->RegisterBooleanPref( |
| 322 prefs::kResolveTimezoneByGeolocation, true, | 324 prefs::kResolveTimezoneByGeolocation, true, |
| 323 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | 325 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
| 324 | 326 |
| 325 input_method::InputMethodSyncer::RegisterProfilePrefs(registry); | 327 registry->RegisterBooleanPref( |
| 328 prefs::kCaptivePortalAuthenticationIgnoresProxy, true, |
| 329 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
| 326 } | 330 } |
| 327 | 331 |
| 328 void Preferences::InitUserPrefs(PrefServiceSyncable* prefs) { | 332 void Preferences::InitUserPrefs(PrefServiceSyncable* prefs) { |
| 329 prefs_ = prefs; | 333 prefs_ = prefs; |
| 330 | 334 |
| 331 BooleanPrefMember::NamedChangeCallback callback = | 335 BooleanPrefMember::NamedChangeCallback callback = |
| 332 base::Bind(&Preferences::OnPreferenceChanged, base::Unretained(this)); | 336 base::Bind(&Preferences::OnPreferenceChanged, base::Unretained(this)); |
| 333 | 337 |
| 334 performance_tracing_enabled_.Init(prefs::kPerformanceTracingEnabled, | 338 performance_tracing_enabled_.Init(prefs::kPerformanceTracingEnabled, |
| 335 prefs, callback); | 339 prefs, callback); |
| (...skipping 392 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 728 touch_hud_projection_enabled_.SetValue(enabled); | 732 touch_hud_projection_enabled_.SetValue(enabled); |
| 729 } | 733 } |
| 730 | 734 |
| 731 void Preferences::ActiveUserChanged(const user_manager::User* active_user) { | 735 void Preferences::ActiveUserChanged(const user_manager::User* active_user) { |
| 732 if (active_user != user_) | 736 if (active_user != user_) |
| 733 return; | 737 return; |
| 734 ApplyPreferences(REASON_ACTIVE_USER_CHANGED, ""); | 738 ApplyPreferences(REASON_ACTIVE_USER_CHANGED, ""); |
| 735 } | 739 } |
| 736 | 740 |
| 737 } // namespace chromeos | 741 } // namespace chromeos |
| OLD | NEW |