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

Unified Diff: chrome/browser/ui/ash/launcher/multi_profile_app_window_launcher_controller.cc

Issue 1165323004: We should use UserID object to identify users instead of username. Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 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/launcher/multi_profile_app_window_launcher_controller.cc
diff --git a/chrome/browser/ui/ash/launcher/multi_profile_app_window_launcher_controller.cc b/chrome/browser/ui/ash/launcher/multi_profile_app_window_launcher_controller.cc
index 00e8c7379ed6a1c4c18ac5bd400f9cad9a12356a..5a389f64823a0bd40b6b1f09f635dec518e64ecd 100644
--- a/chrome/browser/ui/ash/launcher/multi_profile_app_window_launcher_controller.cc
+++ b/chrome/browser/ui/ash/launcher/multi_profile_app_window_launcher_controller.cc
@@ -36,7 +36,7 @@ MultiProfileAppWindowLauncherController::
}
void MultiProfileAppWindowLauncherController::ActiveUserChanged(
- const std::string& user_email) {
+ const user_manager::UserID& user_id) {
// The active user has changed and we need to traverse our list of items to
// show / hide them one by one. To avoid that a user dependent state
// "survives" in a launcher item, we first delete all items making sure that
@@ -147,7 +147,7 @@ bool MultiProfileAppWindowLauncherController::UserHasAppOnActiveDesktop(
const std::string& app_id = app_window->extension_id();
content::BrowserContext* app_context = app_window->browser_context();
DCHECK(!app_context->IsOffTheRecord());
- const std::string& current_user = multi_user_util::GetCurrentUserId();
+ const user_manager::UserID& current_user = multi_user_util::GetCurrentUserId();
chrome::MultiUserWindowManager* manager =
chrome::MultiUserWindowManager::GetInstance();
for (AppWindowList::iterator it = app_window_list_.begin();

Powered by Google App Engine
This is Rietveld 408576698