Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(95)

Side by Side Diff: chrome/browser/ui/webui/chromeos/login/oobe_ui.cc

Issue 789353004: Host Chrome OS GAIA signin page in webview (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase + switch to messages instead of listener interface Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 } else { 117 } else {
117 source->SetDefaultResource(IDR_LOGIN_HTML); 118 source->SetDefaultResource(IDR_LOGIN_HTML);
118 source->AddResourcePath(kLoginJSPath, IDR_LOGIN_JS); 119 source->AddResourcePath(kLoginJSPath, IDR_LOGIN_JS);
119 } 120 }
120 source->AddResourcePath(kKeyboardUtilsJSPath, IDR_KEYBOARD_UTILS_JS); 121 source->AddResourcePath(kKeyboardUtilsJSPath, IDR_KEYBOARD_UTILS_JS);
121 source->OverrideContentSecurityPolicyFrameSrc( 122 source->OverrideContentSecurityPolicyFrameSrc(
122 base::StringPrintf( 123 base::StringPrintf(
123 "frame-src chrome://terms/ %s/;", 124 "frame-src chrome://terms/ %s/;",
124 extensions::kGaiaAuthExtensionOrigin)); 125 extensions::kGaiaAuthExtensionOrigin));
125 source->OverrideContentSecurityPolicyObjectSrc("object-src *;"); 126 source->OverrideContentSecurityPolicyObjectSrc("object-src *;");
127 bool is_webview_signin_enabled = StartupUtils::IsWebviewSigninEnabled();
128 source->AddResourcePath("gaia_auth_host.js", is_webview_signin_enabled ?
129 IDR_GAIA_AUTH_AUTHENTICATOR_JS : IDR_GAIA_AUTH_HOST_JS);
126 130
127 // Serve deferred resources. 131 // Serve deferred resources.
128 source->AddResourcePath(kEnrollmentHTMLPath, IDR_OOBE_ENROLLMENT_HTML); 132 source->AddResourcePath(kEnrollmentHTMLPath, IDR_OOBE_ENROLLMENT_HTML);
129 source->AddResourcePath(kEnrollmentCSSPath, IDR_OOBE_ENROLLMENT_CSS); 133 source->AddResourcePath(kEnrollmentCSSPath, IDR_OOBE_ENROLLMENT_CSS);
130 source->AddResourcePath(kEnrollmentJSPath, IDR_OOBE_ENROLLMENT_JS); 134 source->AddResourcePath(kEnrollmentJSPath, IDR_OOBE_ENROLLMENT_JS);
131 135
132 if (display_type == OobeUI::kOobeDisplay) { 136 if (display_type == OobeUI::kOobeDisplay) {
133 source->AddResourcePath(kCustomElementsHTMLPath, IDR_CUSTOM_ELEMENTS_HTML); 137 source->AddResourcePath(kCustomElementsHTMLPath, IDR_CUSTOM_ELEMENTS_HTML);
134 source->AddResourcePath(kCustomElementsJSPath, IDR_CUSTOM_ELEMENTS_JS); 138 source->AddResourcePath(kCustomElementsJSPath, IDR_CUSTOM_ELEMENTS_JS);
135 139
(...skipping 497 matching lines...) Expand 10 before | Expand all | Expand 10 after
633 DCHECK(screen_ids_.count(screen)) 637 DCHECK(screen_ids_.count(screen))
634 << "Screen should be registered in InitializeScreenMaps()"; 638 << "Screen should be registered in InitializeScreenMaps()";
635 Screen new_screen = screen_ids_[screen]; 639 Screen new_screen = screen_ids_[screen];
636 FOR_EACH_OBSERVER(Observer, 640 FOR_EACH_OBSERVER(Observer,
637 observer_list_, 641 observer_list_,
638 OnCurrentScreenChanged(current_screen_, new_screen)); 642 OnCurrentScreenChanged(current_screen_, new_screen));
639 current_screen_ = new_screen; 643 current_screen_ = new_screen;
640 } 644 }
641 645
642 } // namespace chromeos 646 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc ('k') | chrome/common/pref_names.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698