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

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

Issue 418043002: Add test for showing confirmation dialog for unsecure signin (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 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 | Annotate | Revision Log
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/values.h" 10 #include "base/values.h"
10 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h" 11 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h"
11 #include "chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen_ actor.h" 12 #include "chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen_ actor.h"
12 #include "chrome/browser/chromeos/login/enrollment/enrollment_screen_actor.h" 13 #include "chrome/browser/chromeos/login/enrollment/enrollment_screen_actor.h"
13 #include "chrome/browser/chromeos/system/input_device_settings.h" 14 #include "chrome/browser/chromeos/system/input_device_settings.h"
14 #include "chrome/browser/profiles/profile.h" 15 #include "chrome/browser/profiles/profile.h"
15 #include "chrome/browser/ui/webui/about_ui.h" 16 #include "chrome/browser/ui/webui/about_ui.h"
16 #include "chrome/browser/ui/webui/chromeos/login/app_launch_splash_screen_handle r.h" 17 #include "chrome/browser/ui/webui/chromeos/login/app_launch_splash_screen_handle r.h"
17 #include "chrome/browser/ui/webui/chromeos/login/auto_enrollment_check_screen_ha ndler.h" 18 #include "chrome/browser/ui/webui/chromeos/login/auto_enrollment_check_screen_ha ndler.h"
18 #include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h" 19 #include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h"
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 } 88 }
88 if (display_type == OobeUI::kOobeDisplay) { 89 if (display_type == OobeUI::kOobeDisplay) {
89 source->SetDefaultResource(IDR_OOBE_HTML); 90 source->SetDefaultResource(IDR_OOBE_HTML);
90 source->AddResourcePath(kOobeJSPath, IDR_OOBE_JS); 91 source->AddResourcePath(kOobeJSPath, IDR_OOBE_JS);
91 } else { 92 } else {
92 source->SetDefaultResource(IDR_LOGIN_HTML); 93 source->SetDefaultResource(IDR_LOGIN_HTML);
93 source->AddResourcePath(kLoginJSPath, IDR_LOGIN_JS); 94 source->AddResourcePath(kLoginJSPath, IDR_LOGIN_JS);
94 } 95 }
95 source->AddResourcePath(kKeyboardUtilsJSPath, IDR_KEYBOARD_UTILS_JS); 96 source->AddResourcePath(kKeyboardUtilsJSPath, IDR_KEYBOARD_UTILS_JS);
96 source->OverrideContentSecurityPolicyFrameSrc( 97 source->OverrideContentSecurityPolicyFrameSrc(
97 "frame-src chrome://terms/ " 98 base::StringPrintf(
98 "chrome-extension://mfffpogegjflfpflabcdkioaeobkgjik/;"); 99 "frame-src chrome://terms/ %s/;",
100 extensions::kGaiaAuthExtensionOrigin);
99 101
100 // Serve deferred resources. 102 // Serve deferred resources.
101 source->AddResourcePath(kEnrollmentHTMLPath, IDR_OOBE_ENROLLMENT_HTML); 103 source->AddResourcePath(kEnrollmentHTMLPath, IDR_OOBE_ENROLLMENT_HTML);
102 source->AddResourcePath(kEnrollmentCSSPath, IDR_OOBE_ENROLLMENT_CSS); 104 source->AddResourcePath(kEnrollmentCSSPath, IDR_OOBE_ENROLLMENT_CSS);
103 source->AddResourcePath(kEnrollmentJSPath, IDR_OOBE_ENROLLMENT_JS); 105 source->AddResourcePath(kEnrollmentJSPath, IDR_OOBE_ENROLLMENT_JS);
104 106
105 return source; 107 return source;
106 } 108 }
107 109
108 std::string GetDisplayType(const GURL& url) { 110 std::string GetDisplayType(const GURL& url) {
(...skipping 421 matching lines...) Expand 10 before | Expand all | Expand 10 after
530 DCHECK(screen_ids_.count(screen)) 532 DCHECK(screen_ids_.count(screen))
531 << "Screen should be registered in InitializeScreenMaps()"; 533 << "Screen should be registered in InitializeScreenMaps()";
532 Screen new_screen = screen_ids_[screen]; 534 Screen new_screen = screen_ids_[screen];
533 FOR_EACH_OBSERVER(Observer, 535 FOR_EACH_OBSERVER(Observer,
534 observer_list_, 536 observer_list_,
535 OnCurrentScreenChanged(current_screen_, new_screen)); 537 OnCurrentScreenChanged(current_screen_, new_screen));
536 current_screen_ = new_screen; 538 current_screen_ = new_screen;
537 } 539 }
538 540
539 } // namespace chromeos 541 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698