chrome/browser/feedback/show_feedback_page.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/feedback/show_feedback_page.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/chromeos/file_system_provider/notification_manager.cc ('k') | chrome/browser/notifications/message_center_notifications_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/feedback/show_feedback_page.cc

diff --git a/chrome/browser/feedback/show_feedback_page.cc b/chrome/browser/feedback/show_feedback_page.cc

index f70a83d0b3cccfa1d04d372d08b7b95eaf9cf6b8..6a5c8584344b19a8a92d1d43b208b0238cf2d3b9 100644

--- a/chrome/browser/feedback/show_feedback_page.cc

+++ b/chrome/browser/feedback/show_feedback_page.cc

@@ -13,6 +13,7 @@

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

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

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

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

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

#include "url/gurl.h"

@@ -66,14 +67,14 @@ void ShowFeedbackPage(Browser* browser,

// Obtains the display profile ID on which the Feedback window should show.

chrome::MultiUserWindowManager* const window_manager =

chrome::MultiUserWindowManager::GetInstance();

- const std::string display_profile_id =

+ const AccountId display_account_id =

window_manager && browser

? window_manager->GetUserPresentingWindow(

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

- : "";

- profile = display_profile_id.empty()

- ? profile

- : multi_user_util::GetProfileFromUserID(display_profile_id);

+ : EmptyAccountId();

+ profile = display_account_id.is_valid()

+ ? multi_user_util::GetProfileFromAccountId(display_account_id)

+ : profile;

#endif

extensions::FeedbackPrivateAPI* api =