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/magnifier/magnifier_constants.h" | 10 #include "ash/magnifier/magnifier_constants.h" |
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
76 // no need to remove this shell observer. | 76 // no need to remove this shell observer. |
77 if (ash::Shell::HasInstance()) | 77 if (ash::Shell::HasInstance()) |
78 ash::Shell::GetInstance()->RemoveShellObserver(this); | 78 ash::Shell::GetInstance()->RemoveShellObserver(this); |
79 } | 79 } |
80 | 80 |
81 // static | 81 // static |
82 void Preferences::RegisterPrefs(PrefRegistrySimple* registry) { | 82 void Preferences::RegisterPrefs(PrefRegistrySimple* registry) { |
83 registry->RegisterBooleanPref(prefs::kOwnerPrimaryMouseButtonRight, false); | 83 registry->RegisterBooleanPref(prefs::kOwnerPrimaryMouseButtonRight, false); |
84 registry->RegisterBooleanPref(prefs::kOwnerTapToClickEnabled, true); | 84 registry->RegisterBooleanPref(prefs::kOwnerTapToClickEnabled, true); |
85 registry->RegisterBooleanPref(prefs::kVirtualKeyboardEnabled, false); | 85 registry->RegisterBooleanPref(prefs::kVirtualKeyboardEnabled, false); |
| 86 registry->RegisterStringPref(prefs::kLogoutStartedLast, std::string()); |
86 } | 87 } |
87 | 88 |
88 // static | 89 // static |
89 void Preferences::RegisterProfilePrefs( | 90 void Preferences::RegisterProfilePrefs( |
90 user_prefs::PrefRegistrySyncable* registry) { | 91 user_prefs::PrefRegistrySyncable* registry) { |
91 std::string hardware_keyboard_id; | 92 std::string hardware_keyboard_id; |
92 // TODO(yusukes): Remove the runtime hack. | 93 // TODO(yusukes): Remove the runtime hack. |
93 if (base::SysInfo::IsRunningOnChromeOS()) { | 94 if (base::SysInfo::IsRunningOnChromeOS()) { |
94 DCHECK(g_browser_process); | 95 DCHECK(g_browser_process); |
95 PrefService* local_state = g_browser_process->local_state(); | 96 PrefService* local_state = g_browser_process->local_state(); |
(...skipping 545 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
641 touch_hud_projection_enabled_.SetValue(enabled); | 642 touch_hud_projection_enabled_.SetValue(enabled); |
642 } | 643 } |
643 | 644 |
644 void Preferences::ActiveUserChanged(const User* active_user) { | 645 void Preferences::ActiveUserChanged(const User* active_user) { |
645 if (active_user != user_) | 646 if (active_user != user_) |
646 return; | 647 return; |
647 ApplyPreferences(REASON_ACTIVE_USER_CHANGED, ""); | 648 ApplyPreferences(REASON_ACTIVE_USER_CHANGED, ""); |
648 } | 649 } |
649 | 650 |
650 } // namespace chromeos | 651 } // namespace chromeos |
OLD | NEW |