| 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 |
| 11 #include "ash/common/wm/screen_dimmer.h" | 11 #include "ash/common/wm/screen_dimmer.h" |
| 12 #include "base/command_line.h" | 12 #include "base/command_line.h" |
| 13 #include "base/logging.h" | 13 #include "base/logging.h" |
| 14 #include "base/macros.h" | 14 #include "base/macros.h" |
| 15 #include "base/memory/ptr_util.h" | 15 #include "base/memory/ptr_util.h" |
| 16 #include "base/strings/stringprintf.h" | 16 #include "base/strings/stringprintf.h" |
| 17 #include "base/values.h" | 17 #include "base/values.h" |
| 18 #include "chrome/browser/browser_process.h" | 18 #include "chrome/browser/browser_process.h" |
| 19 #include "chrome/browser/browser_process_platform_part.h" | 19 #include "chrome/browser/browser_process_platform_part.h" |
| 20 #include "chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen_
actor.h" | 20 #include "chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen_
actor.h" |
| 21 #include "chrome/browser/chromeos/login/enrollment/enrollment_screen_actor.h" | 21 #include "chrome/browser/chromeos/login/enrollment/enrollment_screen_actor.h" |
| 22 #include "chrome/browser/chromeos/login/screens/error_screen.h" | 22 #include "chrome/browser/chromeos/login/screens/error_screen.h" |
| 23 #include "chrome/browser/chromeos/login/startup_utils.h" | |
| 24 #include "chrome/browser/chromeos/login/ui/login_display_host.h" | 23 #include "chrome/browser/chromeos/login/ui/login_display_host.h" |
| 25 #include "chrome/browser/chromeos/login/wizard_controller.h" | 24 #include "chrome/browser/chromeos/login/wizard_controller.h" |
| 26 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" | 25 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" |
| 27 #include "chrome/browser/chromeos/settings/shutdown_policy_handler.h" | 26 #include "chrome/browser/chromeos/settings/shutdown_policy_handler.h" |
| 28 #include "chrome/browser/chromeos/system/input_device_settings.h" | 27 #include "chrome/browser/chromeos/system/input_device_settings.h" |
| 29 #include "chrome/browser/extensions/signin/gaia_auth_extension_loader.h" | 28 #include "chrome/browser/extensions/signin/gaia_auth_extension_loader.h" |
| 30 #include "chrome/browser/extensions/tab_helper.h" | 29 #include "chrome/browser/extensions/tab_helper.h" |
| 31 #include "chrome/browser/profiles/profile.h" | 30 #include "chrome/browser/profiles/profile.h" |
| 32 #include "chrome/browser/ui/ash/ash_util.h" | 31 #include "chrome/browser/ui/ash/ash_util.h" |
| 33 #include "chrome/browser/ui/webui/about_ui.h" | 32 #include "chrome/browser/ui/webui/about_ui.h" |
| (...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 160 source->AddResourcePath(kArcPlaystoreCSSPath, IDR_ARC_SUPPORT_PLAYSTORE_CSS); | 159 source->AddResourcePath(kArcPlaystoreCSSPath, IDR_ARC_SUPPORT_PLAYSTORE_CSS); |
| 161 source->AddResourcePath(kArcPlaystoreJSPath, IDR_ARC_SUPPORT_PLAYSTORE_JS); | 160 source->AddResourcePath(kArcPlaystoreJSPath, IDR_ARC_SUPPORT_PLAYSTORE_JS); |
| 162 | 161 |
| 163 source->AddResourcePath(kKeyboardUtilsJSPath, IDR_KEYBOARD_UTILS_JS); | 162 source->AddResourcePath(kKeyboardUtilsJSPath, IDR_KEYBOARD_UTILS_JS); |
| 164 source->OverrideContentSecurityPolicyChildSrc( | 163 source->OverrideContentSecurityPolicyChildSrc( |
| 165 base::StringPrintf( | 164 base::StringPrintf( |
| 166 "child-src chrome://terms/ %s/;", | 165 "child-src chrome://terms/ %s/;", |
| 167 extensions::kGaiaAuthExtensionOrigin)); | 166 extensions::kGaiaAuthExtensionOrigin)); |
| 168 source->OverrideContentSecurityPolicyObjectSrc( | 167 source->OverrideContentSecurityPolicyObjectSrc( |
| 169 "object-src chrome:;"); | 168 "object-src chrome:;"); |
| 170 source->AddResourcePath("gaia_auth_host.js", | |
| 171 StartupUtils::IsWebviewSigninEnabled() | |
| 172 ? IDR_GAIA_AUTH_AUTHENTICATOR_JS | |
| 173 : IDR_GAIA_AUTH_HOST_JS); | |
| 174 | 169 |
| 175 // Serve deferred resources. | 170 // Serve deferred resources. |
| 176 source->AddResourcePath(kEnrollmentHTMLPath, IDR_OOBE_ENROLLMENT_HTML); | 171 source->AddResourcePath(kEnrollmentHTMLPath, IDR_OOBE_ENROLLMENT_HTML); |
| 177 source->AddResourcePath(kEnrollmentCSSPath, IDR_OOBE_ENROLLMENT_CSS); | 172 source->AddResourcePath(kEnrollmentCSSPath, IDR_OOBE_ENROLLMENT_CSS); |
| 178 source->AddResourcePath(kEnrollmentJSPath, IDR_OOBE_ENROLLMENT_JS); | 173 source->AddResourcePath(kEnrollmentJSPath, IDR_OOBE_ENROLLMENT_JS); |
| 179 | 174 |
| 180 // Only add a filter when runing as test. | 175 // Only add a filter when runing as test. |
| 181 base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); | 176 base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); |
| 182 const bool is_running_test = command_line->HasSwitch(::switches::kTestName) || | 177 const bool is_running_test = command_line->HasSwitch(::switches::kTestName) || |
| 183 command_line->HasSwitch(::switches::kTestType); | 178 command_line->HasSwitch(::switches::kTestType); |
| (...skipping 432 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 616 // http://crbug.com/646034. | 611 // http://crbug.com/646034. |
| 617 NOTIMPLEMENTED(); | 612 NOTIMPLEMENTED(); |
| 618 } | 613 } |
| 619 | 614 |
| 620 current_screen_ = new_screen; | 615 current_screen_ = new_screen; |
| 621 for (Observer& observer : observer_list_) | 616 for (Observer& observer : observer_list_) |
| 622 observer.OnCurrentScreenChanged(current_screen_, new_screen); | 617 observer.OnCurrentScreenChanged(current_screen_, new_screen); |
| 623 } | 618 } |
| 624 | 619 |
| 625 } // namespace chromeos | 620 } // namespace chromeos |
| OLD | NEW |