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