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

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

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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 | « chrome/browser/shell_integration.cc ('k') | chrome/browser/signin/chrome_signin_client.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 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/signin/chrome_proximity_auth_client.h" 5 #include "chrome/browser/signin/chrome_proximity_auth_client.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/prefs/pref_service.h"
11 #include "base/sys_info.h" 10 #include "base/sys_info.h"
12 #include "base/version.h" 11 #include "base/version.h"
13 #include "build/build_config.h" 12 #include "build/build_config.h"
14 #include "chrome/browser/profiles/profile.h" 13 #include "chrome/browser/profiles/profile.h"
15 #include "chrome/browser/profiles/profile_window.h" 14 #include "chrome/browser/profiles/profile_window.h"
16 #include "chrome/browser/signin/easy_unlock_service.h" 15 #include "chrome/browser/signin/easy_unlock_service.h"
17 #include "chrome/browser/signin/easy_unlock_service_regular.h" 16 #include "chrome/browser/signin/easy_unlock_service_regular.h"
18 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" 17 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
19 #include "chrome/browser/signin/signin_manager_factory.h" 18 #include "chrome/browser/signin/signin_manager_factory.h"
19 #include "components/prefs/pref_service.h"
20 #include "components/proximity_auth/cryptauth/cryptauth_client_impl.h" 20 #include "components/proximity_auth/cryptauth/cryptauth_client_impl.h"
21 #include "components/proximity_auth/cryptauth/cryptauth_device_manager.h" 21 #include "components/proximity_auth/cryptauth/cryptauth_device_manager.h"
22 #include "components/proximity_auth/cryptauth/cryptauth_enrollment_manager.h" 22 #include "components/proximity_auth/cryptauth/cryptauth_enrollment_manager.h"
23 #include "components/proximity_auth/cryptauth/secure_message_delegate.h" 23 #include "components/proximity_auth/cryptauth/secure_message_delegate.h"
24 #include "components/proximity_auth/logging/logging.h" 24 #include "components/proximity_auth/logging/logging.h"
25 #include "components/signin/core/browser/profile_oauth2_token_service.h" 25 #include "components/signin/core/browser/profile_oauth2_token_service.h"
26 #include "components/signin/core/browser/signin_manager_base.h" 26 #include "components/signin/core/browser/signin_manager_base.h"
27 #include "components/version_info/version_info.h" 27 #include "components/version_info/version_info.h"
28 28
29 #if defined(OS_CHROMEOS) 29 #if defined(OS_CHROMEOS)
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 } 157 }
158 158
159 EasyUnlockServiceRegular* 159 EasyUnlockServiceRegular*
160 ChromeProximityAuthClient::GetEasyUnlockServiceRegular() { 160 ChromeProximityAuthClient::GetEasyUnlockServiceRegular() {
161 EasyUnlockService* easy_unlock_service = EasyUnlockService::Get(profile_); 161 EasyUnlockService* easy_unlock_service = EasyUnlockService::Get(profile_);
162 if (easy_unlock_service->GetType() == EasyUnlockService::TYPE_REGULAR) 162 if (easy_unlock_service->GetType() == EasyUnlockService::TYPE_REGULAR)
163 return static_cast<EasyUnlockServiceRegular*>(easy_unlock_service); 163 return static_cast<EasyUnlockServiceRegular*>(easy_unlock_service);
164 else 164 else
165 return nullptr; 165 return nullptr;
166 } 166 }
OLDNEW
« no previous file with comments | « chrome/browser/shell_integration.cc ('k') | chrome/browser/signin/chrome_signin_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698