chrome/browser/ui/webui/signin/md_user_manager_ui.cc - Issue 1901853002: Import supervised user dialog

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/webui/signin/md_user_manager_ui.cc

Issue 1901853002: Import supervised user dialog (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@md-user-manager-confirmation-page

Patch Set: Addressed comments Created 4 years, 8 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/resources/md_user_manager/import_supervised_user.js ('K') | « chrome/browser/resources/md_user_manager/user_manager_tutorial.html ('k') | chrome/browser/ui/webui/signin/signin_create_profile_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/signin/md_user_manager_ui.cc

diff --git a/chrome/browser/ui/webui/signin/md_user_manager_ui.cc b/chrome/browser/ui/webui/signin/md_user_manager_ui.cc

index 8c03280dfc66c2b0a90c88bd5f596312f18a032c..f0de4ccd79b4e8c3c40909c4c182736d1e116f90 100644

--- a/chrome/browser/ui/webui/signin/md_user_manager_ui.cc

+++ b/chrome/browser/ui/webui/signin/md_user_manager_ui.cc

@@ -95,6 +95,10 @@ content::WebUIDataSource* MDUserManagerUI::CreateUIDataSource(

IDR_MD_USER_MANAGER_TUTORIAL_JS);

source->AddResourcePath("shared_styles.html",

IDR_MD_USER_MANAGER_SHARED_STYLES_HTML);

+ source->AddResourcePath("import_supervised_user.html",

+ IDR_MD_IMPORT_SUPERVISED_USER_HTML);

+ source->AddResourcePath("import_supervised_user.js",

+ IDR_MD_IMPORT_SUPERVISED_USER_JS);

source->AddResourcePath("supervised_user_create_confirm.html",

IDR_MD_SUPERVISED_USER_CREATE_CONFIRM_HTML);

source->AddResourcePath("supervised_user_create_confirm.js",

@@ -109,6 +113,9 @@ void MDUserManagerUI::GetLocalizedStrings(

base::DictionaryValue* localized_strings) {

user_manager_screen_handler_->GetLocalizedValues(localized_strings);

signin_create_profile_handler_->GetLocalizedValues(localized_strings);

+#if defined(ENABLE_SUPERVISED_USERS)

+ signin_supervised_user_import_handler_->GetLocalizedValues(localized_strings);

+#endif

Roger Tawa OOO till Jul 10th 2016/04/20 15:14:36 For my own info, why is this the only place in the

Moe 2016/04/20 15:28:56 Here isn't exactly the only place. in signin_creat

const std::string& app_locale = g_browser_process->GetApplicationLocale();

webui::SetLoadTimeDataDefaults(app_locale, localized_strings);