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

Unified Diff: chrome/browser/ui/webui/options/chromeos/user_image_source.cc

Issue 1534173003: ChromeOS user_manager: move all KnownUser code to separate file. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: s/FindUsingSAML/IsUsingSAML/ Created 5 years 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
« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc ('k') | components/user_manager.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/options/chromeos/user_image_source.cc
diff --git a/chrome/browser/ui/webui/options/chromeos/user_image_source.cc b/chrome/browser/ui/webui/options/chromeos/user_image_source.cc
index 790543c846ab69fb359022c8c1698344efee6ba8..c7a05e362f70c49e69a41e706b770d21946a4d21 100644
--- a/chrome/browser/ui/webui/options/chromeos/user_image_source.cc
+++ b/chrome/browser/ui/webui/options/chromeos/user_image_source.cc
@@ -9,6 +9,7 @@
#include "base/strings/string_split.h"
#include "chrome/common/url_constants.h"
#include "components/signin/core/account_id/account_id.h"
+#include "components/user_manager/known_user.h"
#include "components/user_manager/user_image/default_user_images.h"
#include "components/user_manager/user_manager.h"
#include "grit/theme_resources.h"
@@ -36,7 +37,7 @@ void ParseRequest(const GURL& url,
// migrated.
if (!status) {
LOG(WARNING) << "Failed to deserialize '" << serialized_account_id << "'";
- account_id = user_manager::UserManager::Get()->GetKnownUserAccountId(
+ account_id = user_manager::known_user::GetAccountId(
serialized_account_id, std::string() /* gaia_id */);
}
*email = account_id.GetUserEmail();
« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc ('k') | components/user_manager.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698