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

Side by Side Diff: chromeos/login/auth/extended_authenticator_impl.cc

Issue 947173002: Remove duplicate includes from chromeos/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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
« no previous file with comments | « chromeos/login/auth/auth_attempt_state.cc ('k') | chromeos/login/auth/mock_url_fetchers.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "chromeos/login/auth/extended_authenticator_impl.h" 5 #include "chromeos/login/auth/extended_authenticator_impl.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/strings/string_number_conversions.h" 8 #include "base/strings/string_number_conversions.h"
9 #include "base/strings/string_util.h" 9 #include "base/strings/string_util.h"
10 #include "chromeos/cryptohome/async_method_caller.h" 10 #include "chromeos/cryptohome/async_method_caller.h"
11 #include "chromeos/cryptohome/cryptohome_parameters.h" 11 #include "chromeos/cryptohome/cryptohome_parameters.h"
12 #include "chromeos/cryptohome/homedir_methods.h" 12 #include "chromeos/cryptohome/homedir_methods.h"
13 #include "chromeos/cryptohome/system_salt_getter.h" 13 #include "chromeos/cryptohome/system_salt_getter.h"
14 #include "chromeos/dbus/cryptohome_client.h" 14 #include "chromeos/dbus/cryptohome_client.h"
15 #include "chromeos/dbus/dbus_thread_manager.h" 15 #include "chromeos/dbus/dbus_thread_manager.h"
16 #include "chromeos/login/auth/auth_status_consumer.h" 16 #include "chromeos/login/auth/auth_status_consumer.h"
17 #include "chromeos/login/auth/key.h" 17 #include "chromeos/login/auth/key.h"
18 #include "chromeos/login/auth/user_context.h" 18 #include "chromeos/login/auth/user_context.h"
19 #include "chromeos/login_event_recorder.h" 19 #include "chromeos/login_event_recorder.h"
20 #include "crypto/sha2.h" 20 #include "crypto/sha2.h"
21 #include "google_apis/gaia/gaia_auth_util.h" 21 #include "google_apis/gaia/gaia_auth_util.h"
22 #include "third_party/cros_system_api/dbus/service_constants.h"
23 22
24 namespace chromeos { 23 namespace chromeos {
25 24
26 namespace { 25 namespace {
27 26
28 void RecordStartMarker(const std::string& marker) { 27 void RecordStartMarker(const std::string& marker) {
29 std::string full_marker = "Cryptohome-"; 28 std::string full_marker = "Cryptohome-";
30 full_marker.append(marker); 29 full_marker.append(marker);
31 full_marker.append("-Start"); 30 full_marker.append("-Start");
32 chromeos::LoginEventRecorder::Get()->AddLoginTimeMarker(full_marker, false); 31 chromeos::LoginEventRecorder::Get()->AddLoginTimeMarker(full_marker, false);
(...skipping 324 matching lines...) Expand 10 before | Expand all | Expand 10 after
357 if (consumer_) 356 if (consumer_)
358 consumer_->OnAuthenticationFailure(state); 357 consumer_->OnAuthenticationFailure(state);
359 358
360 if (old_consumer_) { 359 if (old_consumer_) {
361 AuthFailure failure(AuthFailure::UNLOCK_FAILED); 360 AuthFailure failure(AuthFailure::UNLOCK_FAILED);
362 old_consumer_->OnAuthFailure(failure); 361 old_consumer_->OnAuthFailure(failure);
363 } 362 }
364 } 363 }
365 364
366 } // namespace chromeos 365 } // namespace chromeos
OLDNEW
« no previous file with comments | « chromeos/login/auth/auth_attempt_state.cc ('k') | chromeos/login/auth/mock_url_fetchers.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698