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 "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/logging.h" | 8 #include "base/logging.h" |
9 #include "base/strings/stringprintf.h" | 9 #include "base/strings/stringprintf.h" |
10 #include "base/values.h" | 10 #include "base/values.h" |
11 #include "chrome/browser/browser_process.h" | 11 #include "chrome/browser/browser_process.h" |
12 #include "chrome/browser/browser_process_platform_part.h" | 12 #include "chrome/browser/browser_process_platform_part.h" |
13 #include "chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen_
actor.h" | 13 #include "chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen_
actor.h" |
14 #include "chrome/browser/chromeos/login/enrollment/enrollment_screen_actor.h" | 14 #include "chrome/browser/chromeos/login/enrollment/enrollment_screen_actor.h" |
15 #include "chrome/browser/chromeos/login/screens/error_screen.h" | 15 #include "chrome/browser/chromeos/login/screens/error_screen.h" |
| 16 #include "chrome/browser/chromeos/login/startup_utils.h" |
16 #include "chrome/browser/chromeos/login/ui/login_display_host.h" | 17 #include "chrome/browser/chromeos/login/ui/login_display_host.h" |
17 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h" | 18 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h" |
18 #include "chrome/browser/chromeos/login/wizard_controller.h" | 19 #include "chrome/browser/chromeos/login/wizard_controller.h" |
19 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" | 20 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" |
20 #include "chrome/browser/chromeos/policy/consumer_management_service.h" | 21 #include "chrome/browser/chromeos/policy/consumer_management_service.h" |
21 #include "chrome/browser/chromeos/system/input_device_settings.h" | 22 #include "chrome/browser/chromeos/system/input_device_settings.h" |
22 #include "chrome/browser/extensions/signin/gaia_auth_extension_loader.h" | 23 #include "chrome/browser/extensions/signin/gaia_auth_extension_loader.h" |
23 #include "chrome/browser/extensions/tab_helper.h" | 24 #include "chrome/browser/extensions/tab_helper.h" |
24 #include "chrome/browser/profiles/profile.h" | 25 #include "chrome/browser/profiles/profile.h" |
25 #include "chrome/browser/ui/webui/about_ui.h" | 26 #include "chrome/browser/ui/webui/about_ui.h" |
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
115 } else { | 116 } else { |
116 source->SetDefaultResource(IDR_LOGIN_HTML); | 117 source->SetDefaultResource(IDR_LOGIN_HTML); |
117 source->AddResourcePath(kLoginJSPath, IDR_LOGIN_JS); | 118 source->AddResourcePath(kLoginJSPath, IDR_LOGIN_JS); |
118 } | 119 } |
119 source->AddResourcePath(kKeyboardUtilsJSPath, IDR_KEYBOARD_UTILS_JS); | 120 source->AddResourcePath(kKeyboardUtilsJSPath, IDR_KEYBOARD_UTILS_JS); |
120 source->OverrideContentSecurityPolicyFrameSrc( | 121 source->OverrideContentSecurityPolicyFrameSrc( |
121 base::StringPrintf( | 122 base::StringPrintf( |
122 "frame-src chrome://terms/ %s/;", | 123 "frame-src chrome://terms/ %s/;", |
123 extensions::kGaiaAuthExtensionOrigin)); | 124 extensions::kGaiaAuthExtensionOrigin)); |
124 source->OverrideContentSecurityPolicyObjectSrc("object-src *;"); | 125 source->OverrideContentSecurityPolicyObjectSrc("object-src *;"); |
| 126 bool is_webview_signin_enabled = StartupUtils::IsWebviewSigninEnabled(); |
| 127 source->AddResourcePath("gaia_auth_host.js", is_webview_signin_enabled ? |
| 128 IDR_GAIA_AUTH_AUTHENTICATOR_JS : IDR_GAIA_AUTH_HOST_JS); |
125 | 129 |
126 // Serve deferred resources. | 130 // Serve deferred resources. |
127 source->AddResourcePath(kEnrollmentHTMLPath, IDR_OOBE_ENROLLMENT_HTML); | 131 source->AddResourcePath(kEnrollmentHTMLPath, IDR_OOBE_ENROLLMENT_HTML); |
128 source->AddResourcePath(kEnrollmentCSSPath, IDR_OOBE_ENROLLMENT_CSS); | 132 source->AddResourcePath(kEnrollmentCSSPath, IDR_OOBE_ENROLLMENT_CSS); |
129 source->AddResourcePath(kEnrollmentJSPath, IDR_OOBE_ENROLLMENT_JS); | 133 source->AddResourcePath(kEnrollmentJSPath, IDR_OOBE_ENROLLMENT_JS); |
130 | 134 |
131 if (display_type == OobeUI::kOobeDisplay) { | 135 if (display_type == OobeUI::kOobeDisplay) { |
132 source->AddResourcePath(kCustomElementsHTMLPath, IDR_CUSTOM_ELEMENTS_HTML); | 136 source->AddResourcePath(kCustomElementsHTMLPath, IDR_CUSTOM_ELEMENTS_HTML); |
133 source->AddResourcePath(kCustomElementsJSPath, IDR_CUSTOM_ELEMENTS_JS); | 137 source->AddResourcePath(kCustomElementsJSPath, IDR_CUSTOM_ELEMENTS_JS); |
134 | 138 |
(...skipping 489 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
624 DCHECK(screen_ids_.count(screen)) | 628 DCHECK(screen_ids_.count(screen)) |
625 << "Screen should be registered in InitializeScreenMaps()"; | 629 << "Screen should be registered in InitializeScreenMaps()"; |
626 Screen new_screen = screen_ids_[screen]; | 630 Screen new_screen = screen_ids_[screen]; |
627 FOR_EACH_OBSERVER(Observer, | 631 FOR_EACH_OBSERVER(Observer, |
628 observer_list_, | 632 observer_list_, |
629 OnCurrentScreenChanged(current_screen_, new_screen)); | 633 OnCurrentScreenChanged(current_screen_, new_screen)); |
630 current_screen_ = new_screen; | 634 current_screen_ = new_screen; |
631 } | 635 } |
632 | 636 |
633 } // namespace chromeos | 637 } // namespace chromeos |
OLD | NEW |