| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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_auth_service.h" | 5 #include "chrome/browser/chromeos/arc/arc_auth_service.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "ash/shelf/shelf_delegate.h" | 9 #include "ash/shelf/shelf_delegate.h" |
| 10 #include "ash/shell.h" | 10 #include "ash/shell.h" |
| (...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 113 | 113 |
| 114 // static | 114 // static |
| 115 ArcAuthService* ArcAuthService::Get() { | 115 ArcAuthService* ArcAuthService::Get() { |
| 116 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); | 116 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); |
| 117 return g_arc_auth_service; | 117 return g_arc_auth_service; |
| 118 } | 118 } |
| 119 | 119 |
| 120 // static | 120 // static |
| 121 void ArcAuthService::RegisterProfilePrefs( | 121 void ArcAuthService::RegisterProfilePrefs( |
| 122 user_prefs::PrefRegistrySyncable* registry) { | 122 user_prefs::PrefRegistrySyncable* registry) { |
| 123 registry->RegisterBooleanPref( | 123 // TODO(dspaid): Add a syncable default preference so that new |
| 124 prefs::kArcEnabled, false, | 124 // devices get the last opt-in preference. |
| 125 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); | 125 registry->RegisterBooleanPref(prefs::kArcEnabled, false); |
| 126 registry->RegisterBooleanPref(prefs::kArcSignedIn, false); | 126 registry->RegisterBooleanPref(prefs::kArcSignedIn, false); |
| 127 registry->RegisterBooleanPref(prefs::kArcBackupRestoreEnabled, true); | 127 registry->RegisterBooleanPref(prefs::kArcBackupRestoreEnabled, true); |
| 128 } | 128 } |
| 129 | 129 |
| 130 // static | 130 // static |
| 131 void ArcAuthService::DisableUIForTesting() { | 131 void ArcAuthService::DisableUIForTesting() { |
| 132 g_disable_ui_for_testing = true; | 132 g_disable_ui_for_testing = true; |
| 133 } | 133 } |
| 134 | 134 |
| 135 // static | 135 // static |
| (...skipping 626 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 762 return os << kStateFetchingCode; | 762 return os << kStateFetchingCode; |
| 763 case ArcAuthService::State::ACTIVE: | 763 case ArcAuthService::State::ACTIVE: |
| 764 return os << kStateActive; | 764 return os << kStateActive; |
| 765 default: | 765 default: |
| 766 NOTREACHED(); | 766 NOTREACHED(); |
| 767 return os; | 767 return os; |
| 768 } | 768 } |
| 769 } | 769 } |
| 770 | 770 |
| 771 } // namespace arc | 771 } // namespace arc |
| OLD | NEW |