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

Unified Diff: components/user_manager/user_manager.h

Issue 1463753002: ChromeOS: This CL fixes bug in UserManager::GetKnownUserAccountId . (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update after review. Created 5 years, 1 month 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 side-by-side diff with in-line comments
Download patch
Index: components/user_manager/user_manager.h
diff --git a/components/user_manager/user_manager.h b/components/user_manager/user_manager.h
index 03a08d75222775bf135724aa5e19ebb7ea07b012..59cbbd92ec2e0212f6db546ae9e06f57c99483b0 100644
--- a/components/user_manager/user_manager.h
+++ b/components/user_manager/user_manager.h
@@ -363,10 +363,16 @@ class USER_MANAGER_EXPORT UserManager {
const std::string& path,
const int in_value) = 0;
- // Returns true if user's AccountId was found.
- // Returns it in |out_account_id|.
- virtual bool GetKnownUserAccountId(const AccountId& authenticated_account_id,
- AccountId* out_account_id) = 0;
+ // This call forms full account id of a known user by email and (optionally)
+ // gaia_id.
+ // This is a temporary call while migrating to AccountId.
+ virtual AccountId GetKnownUserAccountIdImpl(const std::string& user_email,
+ const std::string& gaia_id) = 0;
+
+ // The same as above, but doesn't crash in unit_tests when Usermanager
+ // doesn't exist.
+ static AccountId GetKnownUserAccountId(const std::string& user_email,
+ const std::string& gaia_id);
// Updates |gaia_id| for user with |account_id|.
// TODO(alemate): Update this once AccountId contains GAIA ID
« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc ('k') | components/user_manager/user_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698