Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(12)

Side by Side 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 unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/webui/signin/md_user_manager_ui.h" 5 #include "chrome/browser/ui/webui/signin/md_user_manager_ui.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/values.h" 9 #include "base/values.h"
10 #include "chrome/browser/browser_process.h" 10 #include "chrome/browser/browser_process.h"
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 source->AddResourcePath("user_manager_pages.js", 88 source->AddResourcePath("user_manager_pages.js",
89 IDR_MD_USER_MANAGER_PAGES_JS); 89 IDR_MD_USER_MANAGER_PAGES_JS);
90 source->AddResourcePath("user_manager_tutorial.css", 90 source->AddResourcePath("user_manager_tutorial.css",
91 IDR_MD_USER_MANAGER_TUTORIAL_CSS); 91 IDR_MD_USER_MANAGER_TUTORIAL_CSS);
92 source->AddResourcePath("user_manager_tutorial.html", 92 source->AddResourcePath("user_manager_tutorial.html",
93 IDR_MD_USER_MANAGER_TUTORIAL_HTML); 93 IDR_MD_USER_MANAGER_TUTORIAL_HTML);
94 source->AddResourcePath("user_manager_tutorial.js", 94 source->AddResourcePath("user_manager_tutorial.js",
95 IDR_MD_USER_MANAGER_TUTORIAL_JS); 95 IDR_MD_USER_MANAGER_TUTORIAL_JS);
96 source->AddResourcePath("shared_styles.html", 96 source->AddResourcePath("shared_styles.html",
97 IDR_MD_USER_MANAGER_SHARED_STYLES_HTML); 97 IDR_MD_USER_MANAGER_SHARED_STYLES_HTML);
98 source->AddResourcePath("import_supervised_user.html",
99 IDR_MD_IMPORT_SUPERVISED_USER_HTML);
100 source->AddResourcePath("import_supervised_user.js",
101 IDR_MD_IMPORT_SUPERVISED_USER_JS);
98 source->AddResourcePath("supervised_user_create_confirm.html", 102 source->AddResourcePath("supervised_user_create_confirm.html",
99 IDR_MD_SUPERVISED_USER_CREATE_CONFIRM_HTML); 103 IDR_MD_SUPERVISED_USER_CREATE_CONFIRM_HTML);
100 source->AddResourcePath("supervised_user_create_confirm.js", 104 source->AddResourcePath("supervised_user_create_confirm.js",
101 IDR_MD_SUPERVISED_USER_CREATE_CONFIRM_JS); 105 IDR_MD_SUPERVISED_USER_CREATE_CONFIRM_JS);
102 106
103 source->SetDefaultResource(IDR_MD_USER_MANAGER_HTML); 107 source->SetDefaultResource(IDR_MD_USER_MANAGER_HTML);
104 108
105 return source; 109 return source;
106 } 110 }
107 111
108 void MDUserManagerUI::GetLocalizedStrings( 112 void MDUserManagerUI::GetLocalizedStrings(
109 base::DictionaryValue* localized_strings) { 113 base::DictionaryValue* localized_strings) {
110 user_manager_screen_handler_->GetLocalizedValues(localized_strings); 114 user_manager_screen_handler_->GetLocalizedValues(localized_strings);
111 signin_create_profile_handler_->GetLocalizedValues(localized_strings); 115 signin_create_profile_handler_->GetLocalizedValues(localized_strings);
116 #if defined(ENABLE_SUPERVISED_USERS)
117 signin_supervised_user_import_handler_->GetLocalizedValues(localized_strings);
118 #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
112 const std::string& app_locale = g_browser_process->GetApplicationLocale(); 119 const std::string& app_locale = g_browser_process->GetApplicationLocale();
113 webui::SetLoadTimeDataDefaults(app_locale, localized_strings); 120 webui::SetLoadTimeDataDefaults(app_locale, localized_strings);
114 121
115 #if defined(GOOGLE_CHROME_BUILD) 122 #if defined(GOOGLE_CHROME_BUILD)
116 localized_strings->SetString("buildType", "chrome"); 123 localized_strings->SetString("buildType", "chrome");
117 #else 124 #else
118 localized_strings->SetString("buildType", "chromium"); 125 localized_strings->SetString("buildType", "chromium");
119 #endif 126 #endif
120 } 127 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698