OLD | NEW |
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 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
135 source->AddLocalizedStrings(localized_strings); | 135 source->AddLocalizedStrings(localized_strings); |
136 source->SetJsonPath(kStringsJSPath); | 136 source->SetJsonPath(kStringsJSPath); |
137 | 137 |
138 if (display_type == OobeUI::kOobeDisplay) { | 138 if (display_type == OobeUI::kOobeDisplay) { |
139 source->SetDefaultResource(IDR_OOBE_HTML); | 139 source->SetDefaultResource(IDR_OOBE_HTML); |
140 source->AddResourcePath(kOobeJSPath, IDR_OOBE_JS); | 140 source->AddResourcePath(kOobeJSPath, IDR_OOBE_JS); |
141 source->AddResourcePath(kCustomElementsHTMLPath, | 141 source->AddResourcePath(kCustomElementsHTMLPath, |
142 IDR_CUSTOM_ELEMENTS_OOBE_HTML); | 142 IDR_CUSTOM_ELEMENTS_OOBE_HTML); |
143 source->AddResourcePath(kCustomElementsJSPath, IDR_CUSTOM_ELEMENTS_OOBE_JS); | 143 source->AddResourcePath(kCustomElementsJSPath, IDR_CUSTOM_ELEMENTS_OOBE_JS); |
144 } else if (display_type == OobeUI::kLockDisplay) { | 144 } else if (display_type == OobeUI::kLockDisplay) { |
145 source->SetDefaultResource(IDR_LOCK_HTML); | 145 if (command_line->HasSwitch(chromeos::switches::kShowNonViewMdLogin)) { |
146 source->AddResourcePath(kLockJSPath, IDR_LOCK_JS); | 146 source->SetDefaultResource(IDR_MD_LOCK_HTML); |
| 147 source->AddResourcePath(kLockJSPath, IDR_MD_LOCK_JS); |
| 148 source->AddResourcePath(kCustomElementsPinKeyboardHTMLPath, |
| 149 IDR_MD_CUSTOM_ELEMENTS_PIN_KEYBOARD_HTML); |
| 150 source->AddResourcePath(kCustomElementsPinKeyboardJSPath, |
| 151 IDR_MD_CUSTOM_ELEMENTS_PIN_KEYBOARD_JS); |
| 152 } else { |
| 153 source->SetDefaultResource(IDR_LOCK_HTML); |
| 154 source->AddResourcePath(kLockJSPath, IDR_LOCK_JS); |
| 155 source->AddResourcePath(kCustomElementsPinKeyboardHTMLPath, |
| 156 IDR_CUSTOM_ELEMENTS_PIN_KEYBOARD_HTML); |
| 157 source->AddResourcePath(kCustomElementsPinKeyboardJSPath, |
| 158 IDR_CUSTOM_ELEMENTS_PIN_KEYBOARD_JS); |
| 159 } |
147 source->AddResourcePath(kCustomElementsHTMLPath, | 160 source->AddResourcePath(kCustomElementsHTMLPath, |
148 IDR_CUSTOM_ELEMENTS_LOCK_HTML); | 161 IDR_CUSTOM_ELEMENTS_LOCK_HTML); |
149 source->AddResourcePath(kCustomElementsJSPath, IDR_CUSTOM_ELEMENTS_LOCK_JS); | 162 source->AddResourcePath(kCustomElementsJSPath, IDR_CUSTOM_ELEMENTS_LOCK_JS); |
150 source->AddResourcePath(kCustomElementsPinKeyboardHTMLPath, | |
151 IDR_CUSTOM_ELEMENTS_PIN_KEYBOARD_HTML); | |
152 source->AddResourcePath(kCustomElementsPinKeyboardJSPath, | |
153 IDR_CUSTOM_ELEMENTS_PIN_KEYBOARD_JS); | |
154 source->AddResourcePath(kCustomElementsUserPodHTMLPath, | 163 source->AddResourcePath(kCustomElementsUserPodHTMLPath, |
155 IDR_CUSTOM_ELEMENTS_USER_POD_HTML); | 164 IDR_CUSTOM_ELEMENTS_USER_POD_HTML); |
156 } else { | 165 } else { |
157 if (command_line->HasSwitch(chromeos::switches::kShowMdLogin)) { | 166 if (command_line->HasSwitch(chromeos::switches::kShowMdLogin) || |
| 167 command_line->HasSwitch(chromeos::switches::kShowNonViewMdLogin)) { |
158 source->SetDefaultResource(IDR_MD_LOGIN_HTML); | 168 source->SetDefaultResource(IDR_MD_LOGIN_HTML); |
159 source->AddResourcePath(kLoginJSPath, IDR_MD_LOGIN_JS); | 169 source->AddResourcePath(kLoginJSPath, IDR_MD_LOGIN_JS); |
160 } else { | 170 } else { |
161 source->SetDefaultResource(IDR_LOGIN_HTML); | 171 source->SetDefaultResource(IDR_LOGIN_HTML); |
162 source->AddResourcePath(kLoginJSPath, IDR_LOGIN_JS); | 172 source->AddResourcePath(kLoginJSPath, IDR_LOGIN_JS); |
163 } | 173 } |
164 source->AddResourcePath(kCustomElementsHTMLPath, | 174 source->AddResourcePath(kCustomElementsHTMLPath, |
165 IDR_CUSTOM_ELEMENTS_LOGIN_HTML); | 175 IDR_CUSTOM_ELEMENTS_LOGIN_HTML); |
166 source->AddResourcePath(kCustomElementsJSPath, | 176 source->AddResourcePath(kCustomElementsJSPath, |
167 IDR_CUSTOM_ELEMENTS_LOGIN_JS); | 177 IDR_CUSTOM_ELEMENTS_LOGIN_JS); |
(...skipping 464 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
632 GetLocalizedStrings(&localized_strings); | 642 GetLocalizedStrings(&localized_strings); |
633 static_cast<CoreOobeView*>(core_handler_)->ReloadContent(localized_strings); | 643 static_cast<CoreOobeView*>(core_handler_)->ReloadContent(localized_strings); |
634 } | 644 } |
635 | 645 |
636 void OobeUI::OnDisplayConfigurationChanged() { | 646 void OobeUI::OnDisplayConfigurationChanged() { |
637 if (oobe_display_chooser_) | 647 if (oobe_display_chooser_) |
638 oobe_display_chooser_->TryToPlaceUiOnTouchDisplay(); | 648 oobe_display_chooser_->TryToPlaceUiOnTouchDisplay(); |
639 } | 649 } |
640 | 650 |
641 } // namespace chromeos | 651 } // namespace chromeos |
OLD | NEW |