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 <string> | 7 #include <string> |
8 | 8 |
9 #include "base/base_paths.h" | 9 #include "base/base_paths.h" |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 301 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
312 | 312 |
313 void UserSessionManager::InitRlz(Profile* profile) { | 313 void UserSessionManager::InitRlz(Profile* profile) { |
314 #if defined(ENABLE_RLZ) | 314 #if defined(ENABLE_RLZ) |
315 if (!g_browser_process->local_state()->HasPrefPath(prefs::kRLZBrand)) { | 315 if (!g_browser_process->local_state()->HasPrefPath(prefs::kRLZBrand)) { |
316 // Read brand code asynchronously from an OEM data and repost ourselves. | 316 // Read brand code asynchronously from an OEM data and repost ourselves. |
317 google_brand::chromeos::InitBrand( | 317 google_brand::chromeos::InitBrand( |
318 base::Bind(&UserSessionManager::InitRlz, AsWeakPtr(), profile)); | 318 base::Bind(&UserSessionManager::InitRlz, AsWeakPtr(), profile)); |
319 return; | 319 return; |
320 } | 320 } |
321 base::PostTaskAndReplyWithResult( | 321 base::PostTaskAndReplyWithResult( |
322 base::WorkerPool::GetTaskRunner(false), | 322 base::WorkerPool::GetTaskRunner(false).get(), |
323 FROM_HERE, | 323 FROM_HERE, |
324 base::Bind(&base::PathExists, GetRlzDisabledFlagPath()), | 324 base::Bind(&base::PathExists, GetRlzDisabledFlagPath()), |
325 base::Bind(&UserSessionManager::InitRlzImpl, AsWeakPtr(), profile)); | 325 base::Bind(&UserSessionManager::InitRlzImpl, AsWeakPtr(), profile)); |
326 #endif | 326 #endif |
327 } | 327 } |
328 | 328 |
329 OAuth2LoginManager::SessionRestoreStrategy | 329 OAuth2LoginManager::SessionRestoreStrategy |
330 UserSessionManager::GetSigninSessionRestoreStrategy() { | 330 UserSessionManager::GetSigninSessionRestoreStrategy() { |
331 return session_restore_strategy_; | 331 return session_restore_strategy_; |
332 } | 332 } |
(...skipping 721 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1054 return NULL; | 1054 return NULL; |
1055 } | 1055 } |
1056 | 1056 |
1057 if (!easy_unlock_key_manager_) | 1057 if (!easy_unlock_key_manager_) |
1058 easy_unlock_key_manager_.reset(new EasyUnlockKeyManager); | 1058 easy_unlock_key_manager_.reset(new EasyUnlockKeyManager); |
1059 | 1059 |
1060 return easy_unlock_key_manager_.get(); | 1060 return easy_unlock_key_manager_.get(); |
1061 } | 1061 } |
1062 | 1062 |
1063 } // namespace chromeos | 1063 } // namespace chromeos |
OLD | NEW |