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

Side by Side Diff: chrome/browser/signin/easy_unlock_service_regular.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_REGULAR_H_ 5 #ifndef CHROME_BROWSER_SIGNIN_EASY_UNLOCK_SERVICE_REGULAR_H_
6 #define CHROME_BROWSER_SIGNIN_EASY_UNLOCK_SERVICE_REGULAR_H_ 6 #define CHROME_BROWSER_SIGNIN_EASY_UNLOCK_SERVICE_REGULAR_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/callback.h" 10 #include "base/callback.h"
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/prefs/pref_change_registrar.h" 13 #include "base/prefs/pref_change_registrar.h"
14 #include "base/time/time.h" 14 #include "base/time/time.h"
15 #include "chrome/browser/signin/easy_unlock_service.h" 15 #include "chrome/browser/signin/easy_unlock_service.h"
16 #include "chrome/browser/signin/screenlock_bridge.h" 16 #include "components/signin/content/screenlock_bridge.h"
17 17
18 #if defined(OS_CHROMEOS) 18 #if defined(OS_CHROMEOS)
19 #include "chrome/browser/chromeos/login/easy_unlock/short_lived_user_context.h" 19 #include "chrome/browser/chromeos/login/easy_unlock/short_lived_user_context.h"
20 #endif 20 #endif
21 21
22 namespace base { 22 namespace base {
23 class DictionaryValue; 23 class DictionaryValue;
24 class ListValue; 24 class ListValue;
25 } 25 }
26 26
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 // sleep -- e.g. by opening the lid -- but can also be shown if the screen is 124 // sleep -- e.g. by opening the lid -- but can also be shown if the screen is
125 // locked but the computer does not go to sleep. 125 // locked but the computer does not go to sleep.
126 base::TimeTicks lock_screen_last_shown_timestamp_; 126 base::TimeTicks lock_screen_last_shown_timestamp_;
127 127
128 base::WeakPtrFactory<EasyUnlockServiceRegular> weak_ptr_factory_; 128 base::WeakPtrFactory<EasyUnlockServiceRegular> weak_ptr_factory_;
129 129
130 DISALLOW_COPY_AND_ASSIGN(EasyUnlockServiceRegular); 130 DISALLOW_COPY_AND_ASSIGN(EasyUnlockServiceRegular);
131 }; 131 };
132 132
133 #endif // CHROME_BROWSER_SIGNIN_EASY_UNLOCK_SERVICE_REGULAR_H_ 133 #endif // CHROME_BROWSER_SIGNIN_EASY_UNLOCK_SERVICE_REGULAR_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698