Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 #include "chrome/browser/chromeos/login/policy_oauth_fetcher.h" | 5 #include "chrome/browser/chromeos/login/policy_oauth_fetcher.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "chrome/browser/browser_process.h" | 8 #include "chrome/browser/browser_process.h" |
| 9 #include "chrome/browser/policy/browser_policy_connector.h" | 9 #include "chrome/browser/policy/browser_policy_connector.h" |
| 10 #include "chrome/browser/policy/user_cloud_policy_manager.h" | |
| 10 #include "chrome/browser/profiles/profile.h" | 11 #include "chrome/browser/profiles/profile.h" |
| 12 #include "chrome/browser/profiles/profile_manager.h" | |
| 11 #include "chrome/common/net/gaia/gaia_constants.h" | 13 #include "chrome/common/net/gaia/gaia_constants.h" |
| 12 #include "chrome/common/net/gaia/google_service_auth_error.h" | 14 #include "chrome/common/net/gaia/google_service_auth_error.h" |
| 13 | 15 |
| 14 namespace chromeos { | 16 namespace chromeos { |
| 15 | 17 |
| 16 namespace { | 18 namespace { |
| 17 const char kServiceScopeChromeOSDeviceManagement[] = | 19 const char kServiceScopeChromeOSDeviceManagement[] = |
| 18 "https://www.googleapis.com/auth/chromeosdevicemanagement"; | 20 "https://www.googleapis.com/auth/chromeosdevicemanagement"; |
| 19 } // namespace | 21 } // namespace |
| 20 | 22 |
| (...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 87 const std::string& service_name, | 89 const std::string& service_name, |
| 88 const GoogleServiceAuthError& error) { | 90 const GoogleServiceAuthError& error) { |
| 89 LOG(WARNING) << "Failed to get OAuth access token for " << service_name | 91 LOG(WARNING) << "Failed to get OAuth access token for " << service_name |
| 90 << ", error: " << error.state(); | 92 << ", error: " << error.state(); |
| 91 SetPolicyToken(""); | 93 SetPolicyToken(""); |
| 92 } | 94 } |
| 93 | 95 |
| 94 void PolicyOAuthFetcher::SetPolicyToken(const std::string& token) { | 96 void PolicyOAuthFetcher::SetPolicyToken(const std::string& token) { |
| 95 policy_token_ = token; | 97 policy_token_ = token; |
| 96 g_browser_process->browser_policy_connector()->RegisterForUserPolicy(token); | 98 g_browser_process->browser_policy_connector()->RegisterForUserPolicy(token); |
| 99 | |
| 100 // The Profile object passed in to the constructor is destroyed after the | |
| 101 // login process is complete. Get the UserCloudPolicyManager from the user's | |
| 102 // default profile instead. | |
| 103 policy::UserCloudPolicyManager* cloud_policy_manager = | |
| 104 ProfileManager::GetDefaultProfile()->GetUserCloudPolicyManager(); | |
|
Nikita (slow)
2012/08/07 16:35:09
User's default profile in context of Chrome OS whe
Andrew T Wilson (Slow)
2012/08/07 16:55:45
Yes. Once we've called UserManager->UserLoggedIn()
| |
| 105 if (cloud_policy_manager) { | |
| 106 if (token.empty()) | |
| 107 cloud_policy_manager->CancelWaitForPolicyFetch(); | |
| 108 else | |
| 109 cloud_policy_manager->RegisterClient(token); | |
| 110 } | |
| 97 } | 111 } |
| 98 | 112 |
| 99 } // namespace chromeos | 113 } // namespace chromeos |
| OLD | NEW |