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/values.h" | 10 #include "base/values.h" |
10 #include "chrome/browser/browser_process.h" | 11 #include "chrome/browser/browser_process.h" |
11 #include "chrome/browser/browser_process_platform_part.h" | 12 #include "chrome/browser/browser_process_platform_part.h" |
12 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h" | 13 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h" |
13 #include "chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen_
actor.h" | 14 #include "chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen_
actor.h" |
14 #include "chrome/browser/chromeos/login/enrollment/enrollment_screen_actor.h" | 15 #include "chrome/browser/chromeos/login/enrollment/enrollment_screen_actor.h" |
15 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" | 16 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" |
16 #include "chrome/browser/chromeos/policy/consumer_management_service.h" | 17 #include "chrome/browser/chromeos/policy/consumer_management_service.h" |
17 #include "chrome/browser/chromeos/system/input_device_settings.h" | 18 #include "chrome/browser/chromeos/system/input_device_settings.h" |
| 19 #include "chrome/browser/extensions/signin/gaia_auth_extension_loader.h" |
18 #include "chrome/browser/profiles/profile.h" | 20 #include "chrome/browser/profiles/profile.h" |
19 #include "chrome/browser/ui/webui/about_ui.h" | 21 #include "chrome/browser/ui/webui/about_ui.h" |
20 #include "chrome/browser/ui/webui/chromeos/login/app_launch_splash_screen_handle
r.h" | 22 #include "chrome/browser/ui/webui/chromeos/login/app_launch_splash_screen_handle
r.h" |
21 #include "chrome/browser/ui/webui/chromeos/login/auto_enrollment_check_screen_ha
ndler.h" | 23 #include "chrome/browser/ui/webui/chromeos/login/auto_enrollment_check_screen_ha
ndler.h" |
22 #include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h" | 24 #include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h" |
23 #include "chrome/browser/ui/webui/chromeos/login/controller_pairing_screen_handl
er.h" | 25 #include "chrome/browser/ui/webui/chromeos/login/controller_pairing_screen_handl
er.h" |
24 #include "chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.h" | 26 #include "chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.h" |
25 #include "chrome/browser/ui/webui/chromeos/login/error_screen_handler.h" | 27 #include "chrome/browser/ui/webui/chromeos/login/error_screen_handler.h" |
26 #include "chrome/browser/ui/webui/chromeos/login/eula_screen_handler.h" | 28 #include "chrome/browser/ui/webui/chromeos/login/eula_screen_handler.h" |
27 #include "chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h" | 29 #include "chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h" |
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
91 } | 93 } |
92 if (display_type == OobeUI::kOobeDisplay) { | 94 if (display_type == OobeUI::kOobeDisplay) { |
93 source->SetDefaultResource(IDR_OOBE_HTML); | 95 source->SetDefaultResource(IDR_OOBE_HTML); |
94 source->AddResourcePath(kOobeJSPath, IDR_OOBE_JS); | 96 source->AddResourcePath(kOobeJSPath, IDR_OOBE_JS); |
95 } else { | 97 } else { |
96 source->SetDefaultResource(IDR_LOGIN_HTML); | 98 source->SetDefaultResource(IDR_LOGIN_HTML); |
97 source->AddResourcePath(kLoginJSPath, IDR_LOGIN_JS); | 99 source->AddResourcePath(kLoginJSPath, IDR_LOGIN_JS); |
98 } | 100 } |
99 source->AddResourcePath(kKeyboardUtilsJSPath, IDR_KEYBOARD_UTILS_JS); | 101 source->AddResourcePath(kKeyboardUtilsJSPath, IDR_KEYBOARD_UTILS_JS); |
100 source->OverrideContentSecurityPolicyFrameSrc( | 102 source->OverrideContentSecurityPolicyFrameSrc( |
101 "frame-src chrome://terms/ " | 103 base::StringPrintf( |
102 "chrome-extension://mfffpogegjflfpflabcdkioaeobkgjik/;"); | 104 "frame-src chrome://terms/ %s/;", |
| 105 extensions::kGaiaAuthExtensionOrigin)); |
103 | 106 |
104 // Serve deferred resources. | 107 // Serve deferred resources. |
105 source->AddResourcePath(kEnrollmentHTMLPath, IDR_OOBE_ENROLLMENT_HTML); | 108 source->AddResourcePath(kEnrollmentHTMLPath, IDR_OOBE_ENROLLMENT_HTML); |
106 source->AddResourcePath(kEnrollmentCSSPath, IDR_OOBE_ENROLLMENT_CSS); | 109 source->AddResourcePath(kEnrollmentCSSPath, IDR_OOBE_ENROLLMENT_CSS); |
107 source->AddResourcePath(kEnrollmentJSPath, IDR_OOBE_ENROLLMENT_JS); | 110 source->AddResourcePath(kEnrollmentJSPath, IDR_OOBE_ENROLLMENT_JS); |
108 | 111 |
109 return source; | 112 return source; |
110 } | 113 } |
111 | 114 |
112 std::string GetDisplayType(const GURL& url) { | 115 std::string GetDisplayType(const GURL& url) { |
(...skipping 425 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
538 DCHECK(screen_ids_.count(screen)) | 541 DCHECK(screen_ids_.count(screen)) |
539 << "Screen should be registered in InitializeScreenMaps()"; | 542 << "Screen should be registered in InitializeScreenMaps()"; |
540 Screen new_screen = screen_ids_[screen]; | 543 Screen new_screen = screen_ids_[screen]; |
541 FOR_EACH_OBSERVER(Observer, | 544 FOR_EACH_OBSERVER(Observer, |
542 observer_list_, | 545 observer_list_, |
543 OnCurrentScreenChanged(current_screen_, new_screen)); | 546 OnCurrentScreenChanged(current_screen_, new_screen)); |
544 current_screen_ = new_screen; | 547 current_screen_ = new_screen; |
545 } | 548 } |
546 | 549 |
547 } // namespace chromeos | 550 } // namespace chromeos |
OLD | NEW |