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