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 151 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
162 | 162 |
163 // static | 163 // static |
164 void ArcSessionManager::RegisterProfilePrefs( | 164 void ArcSessionManager::RegisterProfilePrefs( |
165 user_prefs::PrefRegistrySyncable* registry) { | 165 user_prefs::PrefRegistrySyncable* registry) { |
166 // TODO(dspaid): Implement a mechanism to allow this to sync on first boot | 166 // TODO(dspaid): Implement a mechanism to allow this to sync on first boot |
167 // only. | 167 // only. |
168 registry->RegisterBooleanPref(prefs::kArcDataRemoveRequested, false); | 168 registry->RegisterBooleanPref(prefs::kArcDataRemoveRequested, false); |
169 registry->RegisterBooleanPref(prefs::kArcEnabled, false); | 169 registry->RegisterBooleanPref(prefs::kArcEnabled, false); |
170 registry->RegisterBooleanPref(prefs::kArcSignedIn, false); | 170 registry->RegisterBooleanPref(prefs::kArcSignedIn, false); |
171 registry->RegisterBooleanPref(prefs::kArcTermsAccepted, false); | 171 registry->RegisterBooleanPref(prefs::kArcTermsAccepted, false); |
| 172 registry->RegisterBooleanPref(prefs::kArcVoiceInteractionValuePropAccepted, |
| 173 false); |
172 // Note that ArcBackupRestoreEnabled and ArcLocationServiceEnabled prefs have | 174 // Note that ArcBackupRestoreEnabled and ArcLocationServiceEnabled prefs have |
173 // to be off by default, until an explicit gesture from the user to enable | 175 // to be off by default, until an explicit gesture from the user to enable |
174 // them is received. This is crucial in the cases when these prefs transition | 176 // them is received. This is crucial in the cases when these prefs transition |
175 // from a previous managed state to the unmanaged. | 177 // from a previous managed state to the unmanaged. |
176 registry->RegisterBooleanPref(prefs::kArcBackupRestoreEnabled, false); | 178 registry->RegisterBooleanPref(prefs::kArcBackupRestoreEnabled, false); |
177 registry->RegisterBooleanPref(prefs::kArcLocationServiceEnabled, false); | 179 registry->RegisterBooleanPref(prefs::kArcLocationServiceEnabled, false); |
178 // This is used to delete the Play user ID if ARC is disabled for an | 180 // This is used to delete the Play user ID if ARC is disabled for an |
179 // AD-managed device. | 181 // AD-managed device. |
180 registry->RegisterStringPref(prefs::kArcActiveDirectoryPlayUserId, | 182 registry->RegisterStringPref(prefs::kArcActiveDirectoryPlayUserId, |
181 std::string()); | 183 std::string()); |
(...skipping 855 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1037 | 1039 |
1038 #undef MAP_STATE | 1040 #undef MAP_STATE |
1039 | 1041 |
1040 // Some compilers report an error even if all values of an enum-class are | 1042 // Some compilers report an error even if all values of an enum-class are |
1041 // covered exhaustively in a switch statement. | 1043 // covered exhaustively in a switch statement. |
1042 NOTREACHED() << "Invalid value " << static_cast<int>(state); | 1044 NOTREACHED() << "Invalid value " << static_cast<int>(state); |
1043 return os; | 1045 return os; |
1044 } | 1046 } |
1045 | 1047 |
1046 } // namespace arc | 1048 } // namespace arc |
OLD | NEW |