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

Unified Diff: chrome/browser/ui/ash/multi_user/multi_user_context_menu_chromeos.cc

Issue 1425093004: Revert of This CL replaces user_manager::UserID with AccountId. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@468875--Chrome-OS-handles-deletion-of-Gmail-account-poorly--Create-AccountID-structure-part2--user_names
Patch Set: Created 5 years, 2 months 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: chrome/browser/ui/ash/multi_user/multi_user_context_menu_chromeos.cc
diff --git a/chrome/browser/ui/ash/multi_user/multi_user_context_menu_chromeos.cc b/chrome/browser/ui/ash/multi_user/multi_user_context_menu_chromeos.cc
index 7d808f1f88616468fae93f070cfe8f860d40a1f6..41738b9f32792528820cec8bbf02c4310173c699 100644
--- a/chrome/browser/ui/ash/multi_user/multi_user_context_menu_chromeos.cc
+++ b/chrome/browser/ui/ash/multi_user/multi_user_context_menu_chromeos.cc
@@ -19,7 +19,6 @@
#include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h"
#include "chrome/common/pref_names.h"
#include "chrome/grit/generated_resources.h"
-#include "components/signin/core/account_id/account_id.h"
#include "components/user_manager/user.h"
#include "components/user_manager/user_manager.h"
#include "ui/aura/window.h"
@@ -96,7 +95,7 @@
return model.Pass();
}
-void OnAcceptTeleportWarning(const AccountId& account_id,
+void OnAcceptTeleportWarning(const std::string& user_id,
aura::Window* window_,
bool no_show_again) {
PrefService* pref = ProfileManager::GetActiveUserProfile()->GetPrefs();
@@ -105,8 +104,8 @@
ash::MultiProfileUMA::RecordTeleportAction(
ash::MultiProfileUMA::TELEPORT_WINDOW_CAPTION_MENU);
- chrome::MultiUserWindowManager::GetInstance()->ShowWindowForUser(
- window_, account_id.GetUserEmail());
+ chrome::MultiUserWindowManager::GetInstance()->ShowWindowForUser(window_,
+ user_id);
}
void ExecuteVisitDesktopCommand(int command_id, aura::Window* window) {
@@ -115,14 +114,14 @@
case IDC_VISIT_DESKTOP_OF_LRU_USER_3: {
// When running the multi user mode on Chrome OS, windows can "visit"
// another user's desktop.
- const AccountId account_id =
+ const std::string& user_id =
ash::Shell::GetInstance()
->session_state_delegate()
->GetUserInfo(IDC_VISIT_DESKTOP_OF_LRU_USER_2 == command_id ? 1
: 2)
- ->GetAccountId();
+ ->GetUserID();
base::Callback<void(bool)> on_accept =
- base::Bind(&OnAcceptTeleportWarning, account_id, window);
+ base::Bind(&OnAcceptTeleportWarning, user_id, window);
// Don't show warning dialog if any logged in user in multi-profiles
// session dismissed it.

Powered by Google App Engine
This is Rietveld 408576698