chrome/browser/ui/ash/launcher/multi_profile_app_window_launcher_controller.cc - Issue 1428213004: This CL replaces std::string user_id in ash/* with AccountId.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1428213004: This CL replaces std::string user_id in ash/* with AccountId. (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

« no previous file with comments | « chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc ('k') | chrome/browser/ui/ash/multi_user/multi_user_context_menu_chromeos.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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..c36f1a2bc3acd1ba1b3b09e48731ff4511594fbc 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

@@ -9,6 +9,7 @@

#include "chrome/browser/ui/ash/multi_user/multi_user_util.h"

#include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h"

#include "chrome/browser/ui/host_desktop.h"

+#include "components/signin/core/account_id/account_id.h"

#include "extensions/browser/app_window/app_window.h"

#include "extensions/browser/app_window/native_app_window.h"

#include "ui/aura/window.h"

@@ -86,7 +87,7 @@ void MultiProfileAppWindowLauncherController::OnAppWindowAdded(

if (!multi_user_util::IsProfileFromActiveUser(profile) &&

UserHasAppOnActiveDesktop(app_window)) {

chrome::MultiUserWindowManager::GetInstance()->ShowWindowForUser(

- app_window->GetNativeWindow(), multi_user_util::GetCurrentUserId());

+ app_window->GetNativeWindow(), multi_user_util::GetCurrentAccountId());

}

@@ -147,7 +148,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 AccountId current_account_id = multi_user_util::GetCurrentAccountId();

chrome::MultiUserWindowManager* manager =

chrome::MultiUserWindowManager::GetInstance();

for (AppWindowList::iterator it = app_window_list_.begin();

@@ -156,7 +157,7 @@ bool MultiProfileAppWindowLauncherController::UserHasAppOnActiveDesktop(

extensions::AppWindow* other_window = *it;

DCHECK(!other_window->browser_context()->IsOffTheRecord());

if (manager->IsWindowOnDesktopOfUser(other_window->GetNativeWindow(),

- current_user) &&

+ current_account_id) &&

app_id == other_window->extension_id() &&

app_context == other_window->browser_context()) {

return true;