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

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

Issue 592893002: Rename ScreelockBridge to SigninScreenBridge Base URL: https://chromium.googlesource.com/chromium/src.git@easy_signin_auth_handler
Patch Set: Created 6 years, 3 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 "base/bind.h" 7 #include "base/bind.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/prefs/pref_service.h" 9 #include "base/prefs/pref_service.h"
10 #include "base/prefs/scoped_user_pref_update.h" 10 #include "base/prefs/scoped_user_pref_update.h"
11 #include "base/values.h" 11 #include "base/values.h"
12 #include "chrome/browser/extensions/extension_service.h" 12 #include "chrome/browser/extensions/extension_service.h"
13 #include "chrome/browser/profiles/profile.h" 13 #include "chrome/browser/profiles/profile.h"
14 #include "chrome/browser/signin/easy_unlock_toggle_flow.h" 14 #include "chrome/browser/signin/easy_unlock_toggle_flow.h"
15 #include "chrome/browser/signin/screenlock_bridge.h" 15 #include "chrome/browser/signin/signin_screen_bridge.h"
16 #include "chrome/browser/ui/extensions/application_launch.h" 16 #include "chrome/browser/ui/extensions/application_launch.h"
17 #include "chrome/common/extensions/extension_constants.h" 17 #include "chrome/common/extensions/extension_constants.h"
18 #include "chrome/common/pref_names.h" 18 #include "chrome/common/pref_names.h"
19 #include "components/pref_registry/pref_registry_syncable.h" 19 #include "components/pref_registry/pref_registry_syncable.h"
20 #include "extensions/browser/extension_system.h" 20 #include "extensions/browser/extension_system.h"
21 21
22 #if defined(OS_CHROMEOS) 22 #if defined(OS_CHROMEOS)
23 #include "chrome/browser/chromeos/profiles/profile_helper.h" 23 #include "chrome/browser/chromeos/profiles/profile_helper.h"
24 #include "components/user_manager/user_manager.h" 24 #include "components/user_manager/user_manager.h"
25 #endif 25 #endif
(...skipping 17 matching lines...) Expand all
43 } 43 }
44 44
45 EasyUnlockServiceRegular::~EasyUnlockServiceRegular() { 45 EasyUnlockServiceRegular::~EasyUnlockServiceRegular() {
46 } 46 }
47 47
48 EasyUnlockService::Type EasyUnlockServiceRegular::GetType() const { 48 EasyUnlockService::Type EasyUnlockServiceRegular::GetType() const {
49 return EasyUnlockService::TYPE_REGULAR; 49 return EasyUnlockService::TYPE_REGULAR;
50 } 50 }
51 51
52 std::string EasyUnlockServiceRegular::GetUserEmail() const { 52 std::string EasyUnlockServiceRegular::GetUserEmail() const {
53 return ScreenlockBridge::GetAuthenticatedUserEmail(profile()); 53 return SigninScreenBridge::GetAuthenticatedUserEmail(profile());
54 } 54 }
55 55
56 void EasyUnlockServiceRegular::LaunchSetup() { 56 void EasyUnlockServiceRegular::LaunchSetup() {
57 ExtensionService* service = 57 ExtensionService* service =
58 extensions::ExtensionSystem::Get(profile())->extension_service(); 58 extensions::ExtensionSystem::Get(profile())->extension_service();
59 const extensions::Extension* extension = 59 const extensions::Extension* extension =
60 service->GetExtensionById(extension_misc::kEasyUnlockAppId, false); 60 service->GetExtensionById(extension_misc::kEasyUnlockAppId, false);
61 61
62 OpenApplication(AppLaunchParams( 62 OpenApplication(AppLaunchParams(
63 profile(), extension, extensions::LAUNCH_CONTAINER_WINDOW, NEW_WINDOW)); 63 profile(), extension, extensions::LAUNCH_CONTAINER_WINDOW, NEW_WINDOW));
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
204 204
205 if (!success) { 205 if (!success) {
206 SetTurnOffFlowStatus(FAIL); 206 SetTurnOffFlowStatus(FAIL);
207 return; 207 return;
208 } 208 }
209 209
210 ClearRemoteDevices(); 210 ClearRemoteDevices();
211 SetTurnOffFlowStatus(IDLE); 211 SetTurnOffFlowStatus(IDLE);
212 ReloadApp(); 212 ReloadApp();
213 } 213 }
OLDNEW
« no previous file with comments | « chrome/browser/signin/easy_unlock_service.cc ('k') | chrome/browser/signin/easy_unlock_service_signin_chromeos.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698