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 "ash/common/shelf/shelf_delegate.h" | 9 #include "ash/common/shelf/shelf_delegate.h" |
10 #include "ash/common/wm_shell.h" | 10 #include "ash/common/wm_shell.h" |
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
116 // Note that ArcBackupRestoreEnabled and ArcLocationServiceEnabled prefs have | 116 // Note that ArcBackupRestoreEnabled and ArcLocationServiceEnabled prefs have |
117 // to be off by default, until an explicit gesture from the user to enable | 117 // to be off by default, until an explicit gesture from the user to enable |
118 // them is received. This is crucial in the cases when these prefs transition | 118 // them is received. This is crucial in the cases when these prefs transition |
119 // from a previous managed state to the unmanaged. | 119 // from a previous managed state to the unmanaged. |
120 registry->RegisterBooleanPref(prefs::kArcBackupRestoreEnabled, false); | 120 registry->RegisterBooleanPref(prefs::kArcBackupRestoreEnabled, false); |
121 registry->RegisterBooleanPref(prefs::kArcLocationServiceEnabled, false); | 121 registry->RegisterBooleanPref(prefs::kArcLocationServiceEnabled, false); |
122 // This is used to delete the Play user ID if ARC is disabled for an | 122 // This is used to delete the Play user ID if ARC is disabled for an |
123 // AD-managed device. | 123 // AD-managed device. |
124 registry->RegisterStringPref(prefs::kArcActiveDirectoryPlayUserId, | 124 registry->RegisterStringPref(prefs::kArcActiveDirectoryPlayUserId, |
125 std::string()); | 125 std::string()); |
| 126 registry->RegisterBooleanPref(prefs::kArcCompatibleFilesystemChosen, false); |
126 } | 127 } |
127 | 128 |
128 // static | 129 // static |
129 bool ArcSessionManager::IsOobeOptInActive() { | 130 bool ArcSessionManager::IsOobeOptInActive() { |
130 // ARC OOBE OptIn is optional for now. Test if it exists and login host is | 131 // ARC OOBE OptIn is optional for now. Test if it exists and login host is |
131 // active. | 132 // active. |
132 if (!user_manager::UserManager::Get()->IsCurrentUserNew()) | 133 if (!user_manager::UserManager::Get()->IsCurrentUserNew()) |
133 return false; | 134 return false; |
134 if (!base::CommandLine::ForCurrentProcess()->HasSwitch( | 135 if (!base::CommandLine::ForCurrentProcess()->HasSwitch( |
135 chromeos::switches::kEnableArcOOBEOptIn)) | 136 chromeos::switches::kEnableArcOOBEOptIn)) |
(...skipping 837 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
973 | 974 |
974 #undef MAP_STATE | 975 #undef MAP_STATE |
975 | 976 |
976 // Some compilers report an error even if all values of an enum-class are | 977 // Some compilers report an error even if all values of an enum-class are |
977 // covered exhaustively in a switch statement. | 978 // covered exhaustively in a switch statement. |
978 NOTREACHED() << "Invalid value " << static_cast<int>(state); | 979 NOTREACHED() << "Invalid value " << static_cast<int>(state); |
979 return os; | 980 return os; |
980 } | 981 } |
981 | 982 |
982 } // namespace arc | 983 } // namespace arc |
OLD | NEW |