OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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/arc/arc_session_manager.h" | 5 #include "chrome/browser/chromeos/arc/arc_session_manager.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/callback_helpers.h" | 10 #include "base/callback_helpers.h" |
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
166 void ArcSessionManager::RegisterProfilePrefs( | 166 void ArcSessionManager::RegisterProfilePrefs( |
167 user_prefs::PrefRegistrySyncable* registry) { | 167 user_prefs::PrefRegistrySyncable* registry) { |
168 // TODO(dspaid): Implement a mechanism to allow this to sync on first boot | 168 // TODO(dspaid): Implement a mechanism to allow this to sync on first boot |
169 // only. | 169 // only. |
170 registry->RegisterBooleanPref(prefs::kArcDataRemoveRequested, false); | 170 registry->RegisterBooleanPref(prefs::kArcDataRemoveRequested, false); |
171 registry->RegisterBooleanPref(prefs::kArcEnabled, false); | 171 registry->RegisterBooleanPref(prefs::kArcEnabled, false); |
172 registry->RegisterBooleanPref(prefs::kArcSignedIn, false); | 172 registry->RegisterBooleanPref(prefs::kArcSignedIn, false); |
173 registry->RegisterBooleanPref(prefs::kArcTermsAccepted, false); | 173 registry->RegisterBooleanPref(prefs::kArcTermsAccepted, false); |
174 registry->RegisterBooleanPref(prefs::kArcVoiceInteractionValuePropAccepted, | 174 registry->RegisterBooleanPref(prefs::kArcVoiceInteractionValuePropAccepted, |
175 false); | 175 false); |
| 176 registry->RegisterBooleanPref(prefs::kVoiceInteractionEnabled, false); |
| 177 registry->RegisterBooleanPref(prefs::kVoiceInteractionContextEnabled, false); |
| 178 registry->RegisterBooleanPref(prefs::kVoiceInteractionPrefSynced, false); |
176 // Note that ArcBackupRestoreEnabled and ArcLocationServiceEnabled prefs have | 179 // Note that ArcBackupRestoreEnabled and ArcLocationServiceEnabled prefs have |
177 // to be off by default, until an explicit gesture from the user to enable | 180 // to be off by default, until an explicit gesture from the user to enable |
178 // them is received. This is crucial in the cases when these prefs transition | 181 // them is received. This is crucial in the cases when these prefs transition |
179 // from a previous managed state to the unmanaged. | 182 // from a previous managed state to the unmanaged. |
180 registry->RegisterBooleanPref(prefs::kArcBackupRestoreEnabled, false); | 183 registry->RegisterBooleanPref(prefs::kArcBackupRestoreEnabled, false); |
181 registry->RegisterBooleanPref(prefs::kArcLocationServiceEnabled, false); | 184 registry->RegisterBooleanPref(prefs::kArcLocationServiceEnabled, false); |
182 // This is used to delete the Play user ID if ARC is disabled for an | 185 // This is used to delete the Play user ID if ARC is disabled for an |
183 // AD-managed device and as an indicator whether the ARC enrollment token has | 186 // AD-managed device and as an indicator whether the ARC enrollment token has |
184 // already been fetched. | 187 // already been fetched. |
185 registry->RegisterStringPref(prefs::kArcActiveDirectoryPlayUserId, | 188 registry->RegisterStringPref(prefs::kArcActiveDirectoryPlayUserId, |
(...skipping 927 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1113 | 1116 |
1114 #undef MAP_STATE | 1117 #undef MAP_STATE |
1115 | 1118 |
1116 // Some compilers report an error even if all values of an enum-class are | 1119 // Some compilers report an error even if all values of an enum-class are |
1117 // covered exhaustively in a switch statement. | 1120 // covered exhaustively in a switch statement. |
1118 NOTREACHED() << "Invalid value " << static_cast<int>(state); | 1121 NOTREACHED() << "Invalid value " << static_cast<int>(state); |
1119 return os; | 1122 return os; |
1120 } | 1123 } |
1121 | 1124 |
1122 } // namespace arc | 1125 } // namespace arc |
OLD | NEW |