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

Side by Side Diff: chrome/browser/ui/webui/signin/md_user_manager_ui.cc

Issue 2025433002: MD User Manager: Display error message when all profiles are locked. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed comment Created 4 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 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 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 const base::DictionaryValue& localized_strings) { 58 const base::DictionaryValue& localized_strings) {
59 content::WebUIDataSource* source = 59 content::WebUIDataSource* source =
60 content::WebUIDataSource::Create(chrome::kChromeUIMdUserManagerHost); 60 content::WebUIDataSource::Create(chrome::kChromeUIMdUserManagerHost);
61 source->AddLocalizedStrings(localized_strings); 61 source->AddLocalizedStrings(localized_strings);
62 source->SetJsonPath("strings.js"); 62 source->SetJsonPath("strings.js");
63 63
64 source->AddResourcePath("control_bar.html", IDR_MD_CONTROL_BAR_HTML); 64 source->AddResourcePath("control_bar.html", IDR_MD_CONTROL_BAR_HTML);
65 source->AddResourcePath("control_bar.js", IDR_MD_CONTROL_BAR_JS); 65 source->AddResourcePath("control_bar.js", IDR_MD_CONTROL_BAR_JS);
66 source->AddResourcePath("create_profile.html", IDR_MD_CREATE_PROFILE_HTML); 66 source->AddResourcePath("create_profile.html", IDR_MD_CREATE_PROFILE_HTML);
67 source->AddResourcePath("create_profile.js", IDR_MD_CREATE_PROFILE_JS); 67 source->AddResourcePath("create_profile.js", IDR_MD_CREATE_PROFILE_JS);
68 source->AddResourcePath("error_dialog.html", IDR_MD_ERROR_DIALOG_HTML);
69 source->AddResourcePath("error_dialog.js", IDR_MD_ERROR_DIALOG_JS);
68 source->AddResourcePath("icons.html", IDR_MD_USER_MANAGER_ICONS_HTML); 70 source->AddResourcePath("icons.html", IDR_MD_USER_MANAGER_ICONS_HTML);
69 source->AddResourcePath("import_supervised_user.html", 71 source->AddResourcePath("import_supervised_user.html",
70 IDR_MD_IMPORT_SUPERVISED_USER_HTML); 72 IDR_MD_IMPORT_SUPERVISED_USER_HTML);
71 source->AddResourcePath("import_supervised_user.js", 73 source->AddResourcePath("import_supervised_user.js",
72 IDR_MD_IMPORT_SUPERVISED_USER_JS); 74 IDR_MD_IMPORT_SUPERVISED_USER_JS);
73 source->AddResourcePath("profile_browser_proxy.html", 75 source->AddResourcePath("profile_browser_proxy.html",
74 IDR_MD_PROFILE_BROWSER_PROXY_HTML); 76 IDR_MD_PROFILE_BROWSER_PROXY_HTML);
75 source->AddResourcePath("profile_browser_proxy.js", 77 source->AddResourcePath("profile_browser_proxy.js",
76 IDR_MD_PROFILE_BROWSER_PROXY_JS); 78 IDR_MD_PROFILE_BROWSER_PROXY_JS);
77 source->AddResourcePath("shared_styles.html", 79 source->AddResourcePath("shared_styles.html",
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 #endif 113 #endif
112 const std::string& app_locale = g_browser_process->GetApplicationLocale(); 114 const std::string& app_locale = g_browser_process->GetApplicationLocale();
113 webui::SetLoadTimeDataDefaults(app_locale, localized_strings); 115 webui::SetLoadTimeDataDefaults(app_locale, localized_strings);
114 116
115 #if defined(GOOGLE_CHROME_BUILD) 117 #if defined(GOOGLE_CHROME_BUILD)
116 localized_strings->SetString("buildType", "chrome"); 118 localized_strings->SetString("buildType", "chrome");
117 #else 119 #else
118 localized_strings->SetString("buildType", "chromium"); 120 localized_strings->SetString("buildType", "chromium");
119 #endif 121 #endif
120 } 122 }
OLDNEW
« no previous file with comments | « chrome/browser/resources/md_user_manager/user_manager.js ('k') | chrome/browser/ui/webui/signin/user_manager_screen_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698