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 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
142 source->AddResourcePath(kCustomElementsHTMLPath, | 142 source->AddResourcePath(kCustomElementsHTMLPath, |
143 IDR_CUSTOM_ELEMENTS_LOGIN_HTML); | 143 IDR_CUSTOM_ELEMENTS_LOGIN_HTML); |
144 source->AddResourcePath(kCustomElementsJSPath, | 144 source->AddResourcePath(kCustomElementsJSPath, |
145 IDR_CUSTOM_ELEMENTS_LOGIN_JS); | 145 IDR_CUSTOM_ELEMENTS_LOGIN_JS); |
146 } | 146 } |
147 source->AddResourcePath(kKeyboardUtilsJSPath, IDR_KEYBOARD_UTILS_JS); | 147 source->AddResourcePath(kKeyboardUtilsJSPath, IDR_KEYBOARD_UTILS_JS); |
148 source->OverrideContentSecurityPolicyChildSrc( | 148 source->OverrideContentSecurityPolicyChildSrc( |
149 base::StringPrintf( | 149 base::StringPrintf( |
150 "child-src chrome://terms/ %s/;", | 150 "child-src chrome://terms/ %s/;", |
151 extensions::kGaiaAuthExtensionOrigin)); | 151 extensions::kGaiaAuthExtensionOrigin)); |
152 source->OverrideContentSecurityPolicyObjectSrc("object-src *;"); | 152 source->OverrideContentSecurityPolicyObjectSrc( |
| 153 "object-src chrome:;"); |
153 source->AddResourcePath("gaia_auth_host.js", | 154 source->AddResourcePath("gaia_auth_host.js", |
154 StartupUtils::IsWebviewSigninEnabled() | 155 StartupUtils::IsWebviewSigninEnabled() |
155 ? IDR_GAIA_AUTH_AUTHENTICATOR_JS | 156 ? IDR_GAIA_AUTH_AUTHENTICATOR_JS |
156 : IDR_GAIA_AUTH_HOST_JS); | 157 : IDR_GAIA_AUTH_HOST_JS); |
157 | 158 |
158 // Serve deferred resources. | 159 // Serve deferred resources. |
159 source->AddResourcePath(kEnrollmentHTMLPath, IDR_OOBE_ENROLLMENT_HTML); | 160 source->AddResourcePath(kEnrollmentHTMLPath, IDR_OOBE_ENROLLMENT_HTML); |
160 source->AddResourcePath(kEnrollmentCSSPath, IDR_OOBE_ENROLLMENT_CSS); | 161 source->AddResourcePath(kEnrollmentCSSPath, IDR_OOBE_ENROLLMENT_CSS); |
161 source->AddResourcePath(kEnrollmentJSPath, IDR_OOBE_ENROLLMENT_JS); | 162 source->AddResourcePath(kEnrollmentJSPath, IDR_OOBE_ENROLLMENT_JS); |
162 | 163 |
(...skipping 429 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
592 NOTIMPLEMENTED(); | 593 NOTIMPLEMENTED(); |
593 } | 594 } |
594 | 595 |
595 current_screen_ = new_screen; | 596 current_screen_ = new_screen; |
596 FOR_EACH_OBSERVER(Observer, | 597 FOR_EACH_OBSERVER(Observer, |
597 observer_list_, | 598 observer_list_, |
598 OnCurrentScreenChanged(current_screen_, new_screen)); | 599 OnCurrentScreenChanged(current_screen_, new_screen)); |
599 } | 600 } |
600 | 601 |
601 } // namespace chromeos | 602 } // namespace chromeos |
OLD | NEW |