| OLD | NEW |
| 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/chromeos/login/session/user_session_manager.h" | 5 #include "chrome/browser/chromeos/login/session/user_session_manager.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <set> | 9 #include <set> |
| 10 #include <string> | 10 #include <string> |
| (...skipping 1740 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1751 else | 1751 else |
| 1752 display = USER_PODS_DISPLAY_DISABLED_REGULAR; | 1752 display = USER_PODS_DISPLAY_DISABLED_REGULAR; |
| 1753 } | 1753 } |
| 1754 UMA_HISTOGRAM_ENUMERATION("UserSessionManager.UserPodsDisplay", display, | 1754 UMA_HISTOGRAM_ENUMERATION("UserSessionManager.UserPodsDisplay", display, |
| 1755 NUM_USER_PODS_DISPLAY); | 1755 NUM_USER_PODS_DISPLAY); |
| 1756 } | 1756 } |
| 1757 | 1757 |
| 1758 void UserSessionManager::OnOAuth2TokensFetched(UserContext context) { | 1758 void UserSessionManager::OnOAuth2TokensFetched(UserContext context) { |
| 1759 if (StartupUtils::IsWebviewSigninEnabled() && TokenHandlesEnabled()) { | 1759 if (StartupUtils::IsWebviewSigninEnabled() && TokenHandlesEnabled()) { |
| 1760 CreateTokenUtilIfMissing(); | 1760 CreateTokenUtilIfMissing(); |
| 1761 if (token_handle_util_->ShouldObtainHandle(context.GetAccountId())) { | 1761 if (!token_handle_util_->HasToken(context.GetAccountId())) { |
| 1762 token_handle_fetcher_.reset(new TokenHandleFetcher( | 1762 token_handle_fetcher_.reset(new TokenHandleFetcher( |
| 1763 token_handle_util_.get(), context.GetAccountId())); | 1763 token_handle_util_.get(), context.GetAccountId())); |
| 1764 token_handle_fetcher_->FillForNewUser( | 1764 token_handle_fetcher_->FillForNewUser( |
| 1765 context.GetAccessToken(), | 1765 context.GetAccessToken(), |
| 1766 base::Bind(&UserSessionManager::OnTokenHandleObtained, | 1766 base::Bind(&UserSessionManager::OnTokenHandleObtained, |
| 1767 weak_factory_.GetWeakPtr())); | 1767 weak_factory_.GetWeakPtr())); |
| 1768 } | 1768 } |
| 1769 } | 1769 } |
| 1770 } | 1770 } |
| 1771 | 1771 |
| (...skipping 27 matching lines...) Expand all Loading... |
| 1799 token_handle_util_.reset(); | 1799 token_handle_util_.reset(); |
| 1800 first_run::GoodiesDisplayer::Delete(); | 1800 first_run::GoodiesDisplayer::Delete(); |
| 1801 } | 1801 } |
| 1802 | 1802 |
| 1803 void UserSessionManager::CreateTokenUtilIfMissing() { | 1803 void UserSessionManager::CreateTokenUtilIfMissing() { |
| 1804 if (!token_handle_util_.get()) | 1804 if (!token_handle_util_.get()) |
| 1805 token_handle_util_.reset(new TokenHandleUtil()); | 1805 token_handle_util_.reset(new TokenHandleUtil()); |
| 1806 } | 1806 } |
| 1807 | 1807 |
| 1808 } // namespace chromeos | 1808 } // namespace chromeos |
| OLD | NEW |