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

Side by Side Diff: chrome/browser/ui/webui/chromeos/login/oobe_ui.cc

Issue 2816713003: cros: Load pin assets on sign-in screen. (Closed)
Patch Set: Add change to md_login as well. Created 3 years, 7 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
« no previous file with comments | « chrome/browser/resources/chromeos/login/md_login.js ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/chromeos/login/oobe_ui.h" 5 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <memory> 9 #include <memory>
10 10
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 source->SetDefaultResource(IDR_MD_LOGIN_HTML); 154 source->SetDefaultResource(IDR_MD_LOGIN_HTML);
155 source->AddResourcePath(kLoginJSPath, IDR_MD_LOGIN_JS); 155 source->AddResourcePath(kLoginJSPath, IDR_MD_LOGIN_JS);
156 } else { 156 } else {
157 source->SetDefaultResource(IDR_LOGIN_HTML); 157 source->SetDefaultResource(IDR_LOGIN_HTML);
158 source->AddResourcePath(kLoginJSPath, IDR_LOGIN_JS); 158 source->AddResourcePath(kLoginJSPath, IDR_LOGIN_JS);
159 } 159 }
160 source->AddResourcePath(kCustomElementsHTMLPath, 160 source->AddResourcePath(kCustomElementsHTMLPath,
161 IDR_CUSTOM_ELEMENTS_LOGIN_HTML); 161 IDR_CUSTOM_ELEMENTS_LOGIN_HTML);
162 source->AddResourcePath(kCustomElementsJSPath, 162 source->AddResourcePath(kCustomElementsJSPath,
163 IDR_CUSTOM_ELEMENTS_LOGIN_JS); 163 IDR_CUSTOM_ELEMENTS_LOGIN_JS);
164 source->AddResourcePath(kCustomElementsPinKeyboardHTMLPath,
165 IDR_CUSTOM_ELEMENTS_PIN_KEYBOARD_HTML);
166 source->AddResourcePath(kCustomElementsPinKeyboardJSPath,
167 IDR_CUSTOM_ELEMENTS_PIN_KEYBOARD_JS);
164 source->AddResourcePath(kCustomElementsUserPodHTMLPath, 168 source->AddResourcePath(kCustomElementsUserPodHTMLPath,
165 IDR_CUSTOM_ELEMENTS_USER_POD_HTML); 169 IDR_CUSTOM_ELEMENTS_USER_POD_HTML);
166 } 170 }
167 171
168 // Required for postprocessing of Goolge PlayStore Terms. 172 // Required for postprocessing of Goolge PlayStore Terms.
169 source->AddResourcePath(kArcPlaystoreCSSPath, IDR_ARC_SUPPORT_PLAYSTORE_CSS); 173 source->AddResourcePath(kArcPlaystoreCSSPath, IDR_ARC_SUPPORT_PLAYSTORE_CSS);
170 source->AddResourcePath(kArcPlaystoreJSPath, IDR_ARC_SUPPORT_PLAYSTORE_JS); 174 source->AddResourcePath(kArcPlaystoreJSPath, IDR_ARC_SUPPORT_PLAYSTORE_JS);
171 source->AddResourcePath(kArcPlaystoreLogoPath, 175 source->AddResourcePath(kArcPlaystoreLogoPath,
172 IDR_ARC_SUPPORT_PLAYSTORE_LOGO); 176 IDR_ARC_SUPPORT_PLAYSTORE_LOGO);
173 177
(...skipping 428 matching lines...) Expand 10 before | Expand all | Expand 10 after
602 g_browser_process->local_state()->GetBoolean(prefs::kOobeMdMode)) { 606 g_browser_process->local_state()->GetBoolean(prefs::kOobeMdMode)) {
603 return; 607 return;
604 } 608 }
605 609
606 base::DictionaryValue localized_strings; 610 base::DictionaryValue localized_strings;
607 GetLocalizedStrings(&localized_strings); 611 GetLocalizedStrings(&localized_strings);
608 static_cast<CoreOobeView*>(core_handler_)->ReloadContent(localized_strings); 612 static_cast<CoreOobeView*>(core_handler_)->ReloadContent(localized_strings);
609 } 613 }
610 614
611 } // namespace chromeos 615 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/resources/chromeos/login/md_login.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698