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

Unified Diff: chrome/browser/chromeos/profiles/multiprofiles_session_aborted_dialog.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/chromeos/ownership/owner_settings_service_chromeos.cc ('K') | « chrome/browser/chromeos/profiles/multiprofiles_session_aborted_dialog.h ('k') | chrome/browser/chromeos/profiles/profile_helper.cc » ('j') | chrome/browser/extensions/api/enterprise_platform_keys_private/enterprise_platform_keys_private_api.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/profiles/multiprofiles_session_aborted_dialog.cc

diff --git a/chrome/browser/chromeos/profiles/multiprofiles_session_aborted_dialog.cc b/chrome/browser/chromeos/profiles/multiprofiles_session_aborted_dialog.cc

index 64cc35b8afa41f60d4d6e5d3052e158ae9005d99..9c00d13b27fb4f9e09a464bde3ae9b4942948e5a 100644

--- a/chrome/browser/chromeos/profiles/multiprofiles_session_aborted_dialog.cc

+++ b/chrome/browser/chromeos/profiles/multiprofiles_session_aborted_dialog.cc

@@ -8,6 +8,7 @@

#include "base/strings/utf_string_conversions.h"

#include "chrome/browser/lifetime/application_lifetime.h"

#include "chrome/grit/generated_resources.h"

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

#include "ui/base/l10n/l10n_util.h"

#include "ui/base/resource/resource_bundle.h"

#include "ui/views/controls/button/checkbox.h"

@@ -35,7 +36,7 @@ class MultiprofilesSessionAbortedView : public views::DialogDelegateView {

explicit MultiprofilesSessionAbortedView();

~MultiprofilesSessionAbortedView() override;

- static void ShowDialog(const std::string& user_email);

+ static void ShowDialog(const user_manager::UserID& user_email);

// views::DialogDelegate overrides.

bool Accept() override;

@@ -65,12 +66,12 @@ MultiprofilesSessionAbortedView::~MultiprofilesSessionAbortedView() {

// static

void MultiprofilesSessionAbortedView::ShowDialog(

- const std::string& user_email) {

+ const user_manager::UserID& user_id) {

MultiprofilesSessionAbortedView* dialog_view =

new MultiprofilesSessionAbortedView();

views::DialogDelegate::CreateDialogWidget(

dialog_view, ash::Shell::GetTargetRootWindow(), NULL);

- dialog_view->InitDialog(user_email);

+ dialog_view->InitDialog(user_id.GetUserEmail());

views::Widget* widget = dialog_view->GetWidget();

DCHECK(widget);

widget->Show();

@@ -150,8 +151,8 @@ void MultiprofilesSessionAbortedView::InitDialog(

////////////////////////////////////////////////////////////////////////////////

// Factory function.

-void ShowMultiprofilesSessionAbortedDialog(const std::string& user_email) {

- MultiprofilesSessionAbortedView::ShowDialog(user_email);

+void ShowMultiprofilesSessionAbortedDialog(const user_manager::UserID& user_id) {

+ MultiprofilesSessionAbortedView::ShowDialog(user_id);

}

} // namespace chromeos