chrome/browser/ui/browser_finder.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/browser_finder.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/system_tray_delegate_chromeos.cc ('k') | chrome/browser/ui/browser_finder_chromeos_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/browser_finder.cc

diff --git a/chrome/browser/ui/browser_finder.cc b/chrome/browser/ui/browser_finder.cc

index e4198d48bab1a9e1645d232f8e95dd0e489dd5c0..cd485eeff4cee19132e074146208d3eddd74fbfc 100644

--- a/chrome/browser/ui/browser_finder.cc

+++ b/chrome/browser/ui/browser_finder.cc

@@ -15,6 +15,7 @@

#if defined(OS_CHROMEOS)

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

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

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

#endif

using content::WebContents;

@@ -54,11 +55,12 @@ bool BrowserMatches(Browser* browser,

chrome::MultiUserWindowManager::GetInstance();

Profile* shown_profile = nullptr;

if (window_manager) {

- const std::string& shown_user_id = window_manager->GetUserPresentingWindow(

+ const AccountId& shown_account_id = window_manager->GetUserPresentingWindow(

browser->window()->GetNativeWindow());

- shown_profile = shown_user_id.empty()

- ? nullptr

- : multi_user_util::GetProfileFromUserID(shown_user_id);

+ shown_profile =

+ shown_account_id.is_valid()

+ ? multi_user_util::GetProfileFromAccountId(shown_account_id)

+ : nullptr;

}

#endif

« no previous file with comments | « chrome/browser/ui/ash/system_tray_delegate_chromeos.cc ('k') | chrome/browser/ui/browser_finder_chromeos_unittest.cc » ('j') | no next file with comments »