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

Side by Side Diff: chrome/browser/signin/easy_unlock_service_signin_chromeos.h

Issue 1096293003: Move screenlock_bridge to components/proximity_auth (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix linux build Created 5 years, 8 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 #ifndef CHROME_BROWSER_SIGNIN_EASY_UNLOCK_SERVICE_SIGNIN_CHROMEOS_H_ 5 #ifndef CHROME_BROWSER_SIGNIN_EASY_UNLOCK_SERVICE_SIGNIN_CHROMEOS_H_
6 #define CHROME_BROWSER_SIGNIN_EASY_UNLOCK_SERVICE_SIGNIN_CHROMEOS_H_ 6 #define CHROME_BROWSER_SIGNIN_EASY_UNLOCK_SERVICE_SIGNIN_CHROMEOS_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 10
11 #include "base/macros.h" 11 #include "base/macros.h"
12 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
13 #include "base/memory/weak_ptr.h" 13 #include "base/memory/weak_ptr.h"
14 #include "base/time/time.h" 14 #include "base/time/time.h"
15 #include "base/values.h" 15 #include "base/values.h"
16 #include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_types.h" 16 #include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_types.h"
17 #include "chrome/browser/signin/easy_unlock_service.h" 17 #include "chrome/browser/signin/easy_unlock_service.h"
18 #include "chrome/browser/signin/screenlock_bridge.h"
19 #include "chromeos/login/login_state.h" 18 #include "chromeos/login/login_state.h"
19 #include "components/signin/content/screenlock_bridge.h"
20 20
21 // EasyUnlockService instance that should be used for signin profile. 21 // EasyUnlockService instance that should be used for signin profile.
22 class EasyUnlockServiceSignin : public EasyUnlockService, 22 class EasyUnlockServiceSignin : public EasyUnlockService,
23 public ScreenlockBridge::Observer, 23 public ScreenlockBridge::Observer,
24 public chromeos::LoginState::Observer { 24 public chromeos::LoginState::Observer {
25 public: 25 public:
26 explicit EasyUnlockServiceSignin(Profile* profile); 26 explicit EasyUnlockServiceSignin(Profile* profile);
27 ~EasyUnlockServiceSignin() override; 27 ~EasyUnlockServiceSignin() override;
28 28
29 // Sets |user_id| as the current user of the service. Note this does 29 // Sets |user_id| as the current user of the service. Note this does
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 127
128 // The timestamp for the most recent time when a user pod was focused. 128 // The timestamp for the most recent time when a user pod was focused.
129 base::TimeTicks user_pod_last_focused_timestamp_; 129 base::TimeTicks user_pod_last_focused_timestamp_;
130 130
131 base::WeakPtrFactory<EasyUnlockServiceSignin> weak_ptr_factory_; 131 base::WeakPtrFactory<EasyUnlockServiceSignin> weak_ptr_factory_;
132 132
133 DISALLOW_COPY_AND_ASSIGN(EasyUnlockServiceSignin); 133 DISALLOW_COPY_AND_ASSIGN(EasyUnlockServiceSignin);
134 }; 134 };
135 135
136 #endif // CHROME_BROWSER_SIGNIN_EASY_UNLOCK_SERVICE_SIGNIN_CHROMEOS_H_ 136 #endif // CHROME_BROWSER_SIGNIN_EASY_UNLOCK_SERVICE_SIGNIN_CHROMEOS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698