Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(682)

Side by Side Diff: chrome/browser/chromeos/login/existing_user_controller.cc

Issue 2771803003: Don't start FRE from the login screen (Closed)
Patch Set: Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 1245 matching lines...) Expand 10 before | Expand all | Expand 10 after
1256 } 1256 }
1257 1257
1258 PerformPreLoginActions(user_context); 1258 PerformPreLoginActions(user_context);
1259 1259
1260 if (!time_init_.is_null()) { 1260 if (!time_init_.is_null()) {
1261 base::TimeDelta delta = base::Time::Now() - time_init_; 1261 base::TimeDelta delta = base::Time::Now() - time_init_;
1262 UMA_HISTOGRAM_MEDIUM_TIMES("Login.PromptToCompleteLoginTime", delta); 1262 UMA_HISTOGRAM_MEDIUM_TIMES("Login.PromptToCompleteLoginTime", delta);
1263 time_init_ = base::Time(); // Reset to null. 1263 time_init_ = base::Time(); // Reset to null.
1264 } 1264 }
1265 1265
1266 host_->OnCompleteLogin();
1267
1268 if (user_context.GetAuthFlow() == UserContext::AUTH_FLOW_EASY_BOOTSTRAP) { 1266 if (user_context.GetAuthFlow() == UserContext::AUTH_FLOW_EASY_BOOTSTRAP) {
1269 bootstrap_user_context_initializer_.reset( 1267 bootstrap_user_context_initializer_.reset(
1270 new BootstrapUserContextInitializer()); 1268 new BootstrapUserContextInitializer());
1271 bootstrap_user_context_initializer_->Start( 1269 bootstrap_user_context_initializer_->Start(
1272 user_context.GetAuthCode(), 1270 user_context.GetAuthCode(),
1273 base::Bind(&ExistingUserController::OnBootstrapUserContextInitialized, 1271 base::Bind(&ExistingUserController::OnBootstrapUserContextInitialized,
1274 weak_factory_.GetWeakPtr())); 1272 weak_factory_.GetWeakPtr()));
1275 return; 1273 return;
1276 } 1274 }
1277 1275
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
1385 login_display_->ShowUnrecoverableCrypthomeErrorDialog(); 1383 login_display_->ShowUnrecoverableCrypthomeErrorDialog();
1386 } 1384 }
1387 1385
1388 void ExistingUserController::ClearRecordedNames() { 1386 void ExistingUserController::ClearRecordedNames() {
1389 display_email_.clear(); 1387 display_email_.clear();
1390 display_name_.clear(); 1388 display_name_.clear();
1391 given_name_.clear(); 1389 given_name_.clear();
1392 } 1390 }
1393 1391
1394 } // namespace chromeos 1392 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698