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

Side by Side Diff: chrome/browser/chromeos/login/existing_user_controller.h

Issue 1693383003: ChromeOS cryptohome should be able to use gaia id as user identifier. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed unit tests. Created 4 years, 9 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_CHROMEOS_LOGIN_EXISTING_USER_CONTROLLER_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_EXISTING_USER_CONTROLLER_H_
6 #define CHROME_BROWSER_CHROMEOS_LOGIN_EXISTING_USER_CONTROLLER_H_ 6 #define CHROME_BROWSER_CHROMEOS_LOGIN_EXISTING_USER_CONTROLLER_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 9
10 #include <string> 10 #include <string>
11 11
12 #include "base/callback_forward.h" 12 #include "base/callback_forward.h"
13 #include "base/compiler_specific.h" 13 #include "base/compiler_specific.h"
14 #include "base/gtest_prod_util.h" 14 #include "base/gtest_prod_util.h"
15 #include "base/macros.h" 15 #include "base/macros.h"
16 #include "base/memory/scoped_ptr.h" 16 #include "base/memory/scoped_ptr.h"
17 #include "base/memory/weak_ptr.h" 17 #include "base/memory/weak_ptr.h"
18 #include "base/strings/string16.h" 18 #include "base/strings/string16.h"
19 #include "base/time/time.h" 19 #include "base/time/time.h"
20 #include "base/timer/timer.h" 20 #include "base/timer/timer.h"
21 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" 21 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"
22 #include "chrome/browser/chromeos/login/session/user_session_manager.h" 22 #include "chrome/browser/chromeos/login/session/user_session_manager.h"
23 #include "chrome/browser/chromeos/login/signin/token_handle_util.h" 23 #include "chrome/browser/chromeos/login/signin/token_handle_util.h"
24 #include "chrome/browser/chromeos/login/ui/login_display.h" 24 #include "chrome/browser/chromeos/login/ui/login_display.h"
25 #include "chrome/browser/chromeos/settings/cros_settings.h" 25 #include "chrome/browser/chromeos/settings/cros_settings.h"
26 #include "chrome/browser/chromeos/settings/device_settings_service.h" 26 #include "chrome/browser/chromeos/settings/device_settings_service.h"
27 #include "chromeos/login/auth/login_performer.h" 27 #include "chromeos/login/auth/login_performer.h"
28 #include "chromeos/login/auth/user_context.h" 28 #include "chromeos/login/auth/user_context.h"
29 #include "components/signin/core/account_id/account_id.h"
29 #include "components/user_manager/user.h" 30 #include "components/user_manager/user.h"
30 #include "content/public/browser/notification_observer.h" 31 #include "content/public/browser/notification_observer.h"
31 #include "content/public/browser/notification_registrar.h" 32 #include "content/public/browser/notification_registrar.h"
32 #include "ui/gfx/geometry/rect.h" 33 #include "ui/gfx/geometry/rect.h"
33 #include "url/gurl.h" 34 #include "url/gurl.h"
34 35
35 namespace base { 36 namespace base {
36 class ListValue; 37 class ListValue;
37 } 38 }
38 39
(...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after
249 void OnTokenHandleChecked( 250 void OnTokenHandleChecked(
250 const AccountId&, 251 const AccountId&,
251 TokenHandleUtil::TokenHandleStatus token_handle_status); 252 TokenHandleUtil::TokenHandleStatus token_handle_status);
252 253
253 // Public session auto-login timer. 254 // Public session auto-login timer.
254 scoped_ptr<base::OneShotTimer> auto_login_timer_; 255 scoped_ptr<base::OneShotTimer> auto_login_timer_;
255 256
256 // Public session auto-login timeout, in milliseconds. 257 // Public session auto-login timeout, in milliseconds.
257 int public_session_auto_login_delay_; 258 int public_session_auto_login_delay_;
258 259
259 // Username for public session auto-login. 260 // AccountId for public session auto-login.
260 std::string public_session_auto_login_username_; 261 AccountId public_session_auto_login_account_id_ = EmptyAccountId();
261 262
262 // Used to execute login operations. 263 // Used to execute login operations.
263 scoped_ptr<LoginPerformer> login_performer_; 264 scoped_ptr<LoginPerformer> login_performer_;
264 265
265 // Delegate to forward all authentication status events to. 266 // Delegate to forward all authentication status events to.
266 // Tests can use this to receive authentication status events. 267 // Tests can use this to receive authentication status events.
267 AuthStatusConsumer* auth_status_consumer_ = nullptr; 268 AuthStatusConsumer* auth_status_consumer_ = nullptr;
268 269
269 // AccountId of the last login attempt. 270 // AccountId of the last login attempt.
270 AccountId last_login_attempt_account_id_ = EmptyAccountId(); 271 AccountId last_login_attempt_account_id_ = EmptyAccountId();
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
344 345
345 // Factory of callbacks. 346 // Factory of callbacks.
346 base::WeakPtrFactory<ExistingUserController> weak_factory_; 347 base::WeakPtrFactory<ExistingUserController> weak_factory_;
347 348
348 DISALLOW_COPY_AND_ASSIGN(ExistingUserController); 349 DISALLOW_COPY_AND_ASSIGN(ExistingUserController);
349 }; 350 };
350 351
351 } // namespace chromeos 352 } // namespace chromeos
352 353
353 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_EXISTING_USER_CONTROLLER_H_ 354 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_EXISTING_USER_CONTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698