Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / webui / chromeos / login / oobe_ui.cc

diff --git a/src/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc b/src/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
index c6fd45b..8b73043 100644 (file)
--- a/src/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
+++ b/src/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
@@ -6,6 +6,7 @@
 
 #include "base/command_line.h"
 #include "base/logging.h"
+#include "base/strings/stringprintf.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_process_platform_part.h"
@@ -15,6 +16,7 @@
 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
 #include "chrome/browser/chromeos/policy/consumer_management_service.h"
 #include "chrome/browser/chromeos/system/input_device_settings.h"
+#include "chrome/browser/extensions/signin/gaia_auth_extension_loader.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/webui/about_ui.h"
 #include "chrome/browser/ui/webui/chromeos/login/app_launch_splash_screen_handler.h"
@@ -98,8 +100,9 @@ content::WebUIDataSource* CreateOobeUIDataSource(
   }
   source->AddResourcePath(kKeyboardUtilsJSPath, IDR_KEYBOARD_UTILS_JS);
   source->OverrideContentSecurityPolicyFrameSrc(
-      "frame-src chrome://terms/ "
-      "chrome-extension://mfffpogegjflfpflabcdkioaeobkgjik/;");
+      base::StringPrintf(
+          "frame-src chrome://terms/ %s/;",
+          extensions::kGaiaAuthExtensionOrigin));
 
   // Serve deferred resources.
   source->AddResourcePath(kEnrollmentHTMLPath, IDR_OOBE_ENROLLMENT_HTML);
@@ -264,7 +267,8 @@ OobeUI::OobeUI(content::WebUI* web_ui, const GURL& url)
       g_browser_process->platform_part()->browser_policy_connector_chromeos()->
           GetConsumerManagementService();
   gaia_screen_handler_ =
-      new GaiaScreenHandler(network_state_informer_, consumer_management);
+      new GaiaScreenHandler(
+          core_handler_, network_state_informer_, consumer_management);
   AddScreenHandler(gaia_screen_handler_);
 
   signin_screen_handler_ = new SigninScreenHandler(network_state_informer_,