chrome/browser/ui/browser_finder.cc - Issue 1165323004: We should use UserID object to identify users instead of username.

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

« chrome/browser/profiles/profile_window.cc ('K') | « chrome/browser/ui/ash/user_accounts_delegate_chromeos.cc ('k') | chrome/browser/ui/browser_navigator.cc » ('j') | components/user_manager/user_id.h » ('J')
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 4b5fe8eb6a6d62139e25f8a57567f22db9e1bb29..35b41c257025db15cbb89c7b051e180c9a186b9c 100644

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

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

@@ -10,6 +10,7 @@

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

#include "chrome/browser/ui/tab_contents/tab_contents_iterator.h"

#include "chrome/browser/ui/tabs/tab_strip_model.h"

+#include "components/user_manager/user_id.h"

#include "content/public/browser/navigation_controller.h"

#if defined(OS_CHROMEOS)

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

chrome::MultiUserWindowManager* const window_manager =

chrome::MultiUserWindowManager::GetInstance();

if (window_manager) {

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

+ const user_manager::UserID& shown_user_id = window_manager->GetUserPresentingWindow(

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

Profile* shown_profile =

shown_user_id.empty()