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 303 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
314 prefs::kTouchHudProjectionEnabled, | 314 prefs::kTouchHudProjectionEnabled, |
315 false, | 315 false, |
316 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | 316 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
317 | 317 |
318 registry->RegisterBooleanPref( | 318 registry->RegisterBooleanPref( |
319 prefs::kTouchVirtualKeyboardEnabled, | 319 prefs::kTouchVirtualKeyboardEnabled, |
320 false, | 320 false, |
321 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | 321 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
322 | 322 |
323 input_method::InputMethodSyncer::RegisterProfilePrefs(registry); | 323 input_method::InputMethodSyncer::RegisterProfilePrefs(registry); |
| 324 |
| 325 registry->RegisterBooleanPref( |
| 326 prefs::kCaptivePortalAuthenticationIgnoresProxy, true, |
| 327 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
324 } | 328 } |
325 | 329 |
326 void Preferences::InitUserPrefs(PrefServiceSyncable* prefs) { | 330 void Preferences::InitUserPrefs(PrefServiceSyncable* prefs) { |
327 prefs_ = prefs; | 331 prefs_ = prefs; |
328 | 332 |
329 BooleanPrefMember::NamedChangeCallback callback = | 333 BooleanPrefMember::NamedChangeCallback callback = |
330 base::Bind(&Preferences::OnPreferenceChanged, base::Unretained(this)); | 334 base::Bind(&Preferences::OnPreferenceChanged, base::Unretained(this)); |
331 | 335 |
332 performance_tracing_enabled_.Init(prefs::kPerformanceTracingEnabled, | 336 performance_tracing_enabled_.Init(prefs::kPerformanceTracingEnabled, |
333 prefs, callback); | 337 prefs, callback); |
(...skipping 358 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
692 touch_hud_projection_enabled_.SetValue(enabled); | 696 touch_hud_projection_enabled_.SetValue(enabled); |
693 } | 697 } |
694 | 698 |
695 void Preferences::ActiveUserChanged(const user_manager::User* active_user) { | 699 void Preferences::ActiveUserChanged(const user_manager::User* active_user) { |
696 if (active_user != user_) | 700 if (active_user != user_) |
697 return; | 701 return; |
698 ApplyPreferences(REASON_ACTIVE_USER_CHANGED, ""); | 702 ApplyPreferences(REASON_ACTIVE_USER_CHANGED, ""); |
699 } | 703 } |
700 | 704 |
701 } // namespace chromeos | 705 } // namespace chromeos |
OLD | NEW |