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

Side by Side Diff: chrome/browser/chromeos/login/session/user_session_manager.h

Issue 1870793002: Convert //chrome/browser/chromeos from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 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_CHROMEOS_LOGIN_SESSION_USER_SESSION_MANAGER_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SESSION_USER_SESSION_MANAGER_H_
6 #define CHROME_BROWSER_CHROMEOS_LOGIN_SESSION_USER_SESSION_MANAGER_H_ 6 #define CHROME_BROWSER_CHROMEOS_LOGIN_SESSION_USER_SESSION_MANAGER_H_
7 7
8 #include <memory>
8 #include <string> 9 #include <string>
9 10
10 #include "base/callback.h" 11 #include "base/callback.h"
11 #include "base/macros.h" 12 #include "base/macros.h"
12 #include "base/memory/scoped_ptr.h"
13 #include "base/memory/singleton.h" 13 #include "base/memory/singleton.h"
14 #include "base/memory/weak_ptr.h" 14 #include "base/memory/weak_ptr.h"
15 #include "base/observer_list.h" 15 #include "base/observer_list.h"
16 #include "chrome/browser/chromeos/base/locale_util.h" 16 #include "chrome/browser/chromeos/base/locale_util.h"
17 #include "chrome/browser/chromeos/login/signin/oauth2_login_manager.h" 17 #include "chrome/browser/chromeos/login/signin/oauth2_login_manager.h"
18 #include "chrome/browser/chromeos/login/signin/token_handle_util.h" 18 #include "chrome/browser/chromeos/login/signin/token_handle_util.h"
19 #include "chromeos/dbus/session_manager_client.h" 19 #include "chromeos/dbus/session_manager_client.h"
20 #include "chromeos/login/auth/authenticator.h" 20 #include "chromeos/login/auth/authenticator.h"
21 #include "chromeos/login/auth/user_context.h" 21 #include "chromeos/login/auth/user_context.h"
22 #include "components/user_manager/user.h" 22 #include "components/user_manager/user.h"
(...skipping 387 matching lines...) Expand 10 before | Expand all | Expand 10 after
410 void SendUserPodsMetrics(); 410 void SendUserPodsMetrics();
411 411
412 UserSessionManagerDelegate* delegate_; 412 UserSessionManagerDelegate* delegate_;
413 413
414 // Authentication/user context. 414 // Authentication/user context.
415 UserContext user_context_; 415 UserContext user_context_;
416 scoped_refptr<Authenticator> authenticator_; 416 scoped_refptr<Authenticator> authenticator_;
417 StartSessionType start_session_type_; 417 StartSessionType start_session_type_;
418 418
419 // Injected user context for stub authenticator. 419 // Injected user context for stub authenticator.
420 scoped_ptr<UserContext> injected_user_context_; 420 std::unique_ptr<UserContext> injected_user_context_;
421 421
422 // True if the authentication context's cookie jar contains authentication 422 // True if the authentication context's cookie jar contains authentication
423 // cookies from the authentication extension login flow. 423 // cookies from the authentication extension login flow.
424 bool has_auth_cookies_; 424 bool has_auth_cookies_;
425 425
426 // Active user session restoration related members. 426 // Active user session restoration related members.
427 427
428 // True if user sessions has been restored after crash. 428 // True if user sessions has been restored after crash.
429 // On a normal boot then login into user sessions this will be false. 429 // On a normal boot then login into user sessions this will be false.
430 bool user_sessions_restored_; 430 bool user_sessions_restored_;
(...skipping 25 matching lines...) Expand all
456 // Kiosk mode related members. 456 // Kiosk mode related members.
457 // Chrome oauth client id and secret - override values for kiosk mode. 457 // Chrome oauth client id and secret - override values for kiosk mode.
458 std::string chrome_client_id_; 458 std::string chrome_client_id_;
459 std::string chrome_client_secret_; 459 std::string chrome_client_secret_;
460 460
461 // Per-user-session Input Methods states. 461 // Per-user-session Input Methods states.
462 std::map<Profile*, scoped_refptr<input_method::InputMethodManager::State>, 462 std::map<Profile*, scoped_refptr<input_method::InputMethodManager::State>,
463 ProfileCompare> default_ime_states_; 463 ProfileCompare> default_ime_states_;
464 464
465 // Manages Easy unlock cryptohome keys. 465 // Manages Easy unlock cryptohome keys.
466 scoped_ptr<EasyUnlockKeyManager> easy_unlock_key_manager_; 466 std::unique_ptr<EasyUnlockKeyManager> easy_unlock_key_manager_;
467 bool running_easy_unlock_key_ops_; 467 bool running_easy_unlock_key_ops_;
468 base::Closure easy_unlock_key_ops_finished_callback_; 468 base::Closure easy_unlock_key_ops_finished_callback_;
469 469
470 // Whether should fetch token handles, tests may override this value. 470 // Whether should fetch token handles, tests may override this value.
471 bool should_obtain_handles_; 471 bool should_obtain_handles_;
472 472
473 scoped_ptr<TokenHandleUtil> token_handle_util_; 473 std::unique_ptr<TokenHandleUtil> token_handle_util_;
474 scoped_ptr<TokenHandleFetcher> token_handle_fetcher_; 474 std::unique_ptr<TokenHandleFetcher> token_handle_fetcher_;
475 475
476 // Whether should launch browser, tests may override this value. 476 // Whether should launch browser, tests may override this value.
477 bool should_launch_browser_; 477 bool should_launch_browser_;
478 478
479 // Child account status is necessary for InitializeStartUrls call. 479 // Child account status is necessary for InitializeStartUrls call.
480 bool waiting_for_child_account_status_; 480 bool waiting_for_child_account_status_;
481 481
482 base::WeakPtrFactory<UserSessionManager> weak_factory_; 482 base::WeakPtrFactory<UserSessionManager> weak_factory_;
483 483
484 DISALLOW_COPY_AND_ASSIGN(UserSessionManager); 484 DISALLOW_COPY_AND_ASSIGN(UserSessionManager);
485 }; 485 };
486 486
487 } // namespace chromeos 487 } // namespace chromeos
488 488
489 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_SESSION_USER_SESSION_MANAGER_H_ 489 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_SESSION_USER_SESSION_MANAGER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698