| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/login/existing_user_controller.h" | 5 #include "chrome/browser/chromeos/login/existing_user_controller.h" |
| 6 | 6 |
| 7 #include <memory> | 7 #include <memory> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 172 chromeos::switches::kLoginManager) && | 172 chromeos::switches::kLoginManager) && |
| 173 !session_manager::SessionManager::Get()->IsSessionStarted(); | 173 !session_manager::SessionManager::Get()->IsSessionStarted(); |
| 174 } | 174 } |
| 175 | 175 |
| 176 void RecordPasswordChangeFlow(LoginPasswordChangeFlow flow) { | 176 void RecordPasswordChangeFlow(LoginPasswordChangeFlow flow) { |
| 177 UMA_HISTOGRAM_ENUMERATION("Login.PasswordChangeFlow", flow, | 177 UMA_HISTOGRAM_ENUMERATION("Login.PasswordChangeFlow", flow, |
| 178 LOGIN_PASSWORD_CHANGE_FLOW_COUNT); | 178 LOGIN_PASSWORD_CHANGE_FLOW_COUNT); |
| 179 } | 179 } |
| 180 | 180 |
| 181 bool ShouldForceDircrypto() { | 181 bool ShouldForceDircrypto() { |
| 182 return base::CommandLine::ForCurrentProcess()->HasSwitch( | 182 return !base::CommandLine::ForCurrentProcess()->HasSwitch( |
| 183 chromeos::switches::kEnableEncryptionMigration) && | 183 chromeos::switches::kDisableEncryptionMigration) && |
| 184 (arc::IsArcAvailable() || arc::IsArcKioskAvailable()); | 184 (arc::IsArcAvailable() || arc::IsArcKioskAvailable()); |
| 185 } | 185 } |
| 186 | 186 |
| 187 } // namespace | 187 } // namespace |
| 188 | 188 |
| 189 // static | 189 // static |
| 190 ExistingUserController* ExistingUserController::current_controller_ = nullptr; | 190 ExistingUserController* ExistingUserController::current_controller_ = nullptr; |
| 191 | 191 |
| 192 //////////////////////////////////////////////////////////////////////////////// | 192 //////////////////////////////////////////////////////////////////////////////// |
| 193 // ExistingUserController, public: | 193 // ExistingUserController, public: |
| (...skipping 1256 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1450 login_display_->ShowUnrecoverableCrypthomeErrorDialog(); | 1450 login_display_->ShowUnrecoverableCrypthomeErrorDialog(); |
| 1451 } | 1451 } |
| 1452 | 1452 |
| 1453 void ExistingUserController::ClearRecordedNames() { | 1453 void ExistingUserController::ClearRecordedNames() { |
| 1454 display_email_.clear(); | 1454 display_email_.clear(); |
| 1455 display_name_.clear(); | 1455 display_name_.clear(); |
| 1456 given_name_.clear(); | 1456 given_name_.clear(); |
| 1457 } | 1457 } |
| 1458 | 1458 |
| 1459 } // namespace chromeos | 1459 } // namespace chromeos |
| OLD | NEW |