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

Side by Side Diff: chrome/browser/signin/easy_unlock_service_regular.cc

Issue 1967773004: Fix include path for moved thread_task_runner_handle.h header in chrome/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@a1_move_task_runner_handle
Patch Set: merge up to r393013 Created 4 years, 7 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 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 "chrome/browser/signin/easy_unlock_service_regular.h" 5 #include "chrome/browser/signin/easy_unlock_service_regular.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include <utility> 9 #include <utility>
10 10
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 #include "extensions/browser/event_router.h" 52 #include "extensions/browser/event_router.h"
53 #include "extensions/common/constants.h" 53 #include "extensions/common/constants.h"
54 #include "google_apis/gaia/gaia_auth_util.h" 54 #include "google_apis/gaia/gaia_auth_util.h"
55 55
56 #if defined(OS_CHROMEOS) 56 #if defined(OS_CHROMEOS)
57 #include "apps/app_lifetime_monitor_factory.h" 57 #include "apps/app_lifetime_monitor_factory.h"
58 #include "ash/display/display_info.h" 58 #include "ash/display/display_info.h"
59 #include "ash/display/display_manager.h" 59 #include "ash/display/display_manager.h"
60 #include "ash/shell.h" 60 #include "ash/shell.h"
61 #include "base/linux_util.h" 61 #include "base/linux_util.h"
62 #include "base/thread_task_runner_handle.h" 62 #include "base/threading/thread_task_runner_handle.h"
63 #include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_key_manager.h" 63 #include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_key_manager.h"
64 #include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_reauth.h" 64 #include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_reauth.h"
65 #include "chrome/browser/chromeos/login/session/user_session_manager.h" 65 #include "chrome/browser/chromeos/login/session/user_session_manager.h"
66 #include "chrome/browser/chromeos/profiles/profile_helper.h" 66 #include "chrome/browser/chromeos/profiles/profile_helper.h"
67 #include "components/user_manager/user_manager.h" 67 #include "components/user_manager/user_manager.h"
68 #endif 68 #endif
69 69
70 namespace { 70 namespace {
71 71
72 // Key name of the local device permit record dictonary in kEasyUnlockPairing. 72 // Key name of the local device permit record dictonary in kEasyUnlockPairing.
(...skipping 608 matching lines...) Expand 10 before | Expand all | Expand 10 after
681 PA_LOG(INFO) << "Refresh token not yet available, " 681 PA_LOG(INFO) << "Refresh token not yet available, "
682 << "waiting before starting CryptAuth managers"; 682 << "waiting before starting CryptAuth managers";
683 token_service->AddObserver(this); 683 token_service->AddObserver(this);
684 } 684 }
685 685
686 device_manager_->AddObserver(this); 686 device_manager_->AddObserver(this);
687 enrollment_manager_->Start(); 687 enrollment_manager_->Start();
688 device_manager_->Start(); 688 device_manager_->Start();
689 } 689 }
690 #endif 690 #endif
OLDNEW
« no previous file with comments | « chrome/browser/signin/easy_unlock_service.cc ('k') | chrome/browser/signin/easy_unlock_service_signin_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698