Index: chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc |
diff --git a/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc |
index c2415a2fe7b9b3bf60c6c2b0e14e50e75d8362be..26a61e9bb8323259181a041f13b1f86aad7434e7 100644 |
--- a/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc |
+++ b/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc |
@@ -10,13 +10,13 @@ |
#include "base/values.h" |
#include "chrome/browser/browser_process.h" |
#include "chrome/browser/browser_shutdown.h" |
-#include "chrome/browser/chromeos/login/ui/login_display_host_impl.h" |
#include "chrome/browser/chromeos/login/ui/user_adding_screen.h" |
#include "chrome/browser/chromeos/login/users/user_manager.h" |
#include "chrome/browser/chromeos/profiles/profile_helper.h" |
#include "chrome/browser/chromeos/settings/cros_settings.h" |
#include "chrome/browser/io_thread.h" |
#include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" |
+#include "chrome/browser/ui/webui/signin/inline_login_ui.h" |
#include "chromeos/chromeos_switches.h" |
#include "chromeos/settings/cros_settings_names.h" |
#include "content/public/browser/browser_thread.h" |
@@ -328,8 +328,8 @@ void GaiaScreenHandler::HandleGaiaUIReady() { |
focus_stolen_ = false; |
const char code[] = |
"if (typeof gWindowOnLoad != 'undefined') gWindowOnLoad();"; |
- content::RenderFrameHost* frame = |
- LoginDisplayHostImpl::GetGaiaAuthIframe(web_ui()->GetWebContents()); |
+ content::RenderFrameHost* frame = InlineLoginUI::GetGaiaAuthIframe( |
+ web_ui()->GetWebContents(), NULL, "signin-frame"); |
guohui
2014/07/22 22:07:58
@xiyuan, do we have a known parent frame URL here?
xiyuan
2014/07/22 23:19:12
It should be the same as kGaiaExtOrigin in InlineL
guohui
2014/07/23 16:05:25
Changed the name to "GetAuthIframe", since it coul
|
frame->ExecuteJavaScript(base::ASCIIToUTF16(code)); |
} |
if (gaia_silent_load_) { |
@@ -340,8 +340,8 @@ void GaiaScreenHandler::HandleGaiaUIReady() { |
const char code[] = |
"var gWindowOnLoad = window.onload; " |
"window.onload=function() {};"; |
- content::RenderFrameHost* frame = |
- LoginDisplayHostImpl::GetGaiaAuthIframe(web_ui()->GetWebContents()); |
+ content::RenderFrameHost* frame = InlineLoginUI::GetGaiaAuthIframe( |
+ web_ui()->GetWebContents(), NULL, "signin-frame"); |
frame->ExecuteJavaScript(base::ASCIIToUTF16(code)); |
// As we could miss and window.onload could already be called, restore |
@@ -430,8 +430,8 @@ void GaiaScreenHandler::SubmitLoginFormForTest() { |
code += "document.getElementById('Passwd').value = '" + test_pass_ + "';"; |
code += "document.getElementById('signIn').click();"; |
- content::RenderFrameHost* frame = |
- LoginDisplayHostImpl::GetGaiaAuthIframe(web_ui()->GetWebContents()); |
+ content::RenderFrameHost* frame = InlineLoginUI::GetGaiaAuthIframe( |
+ web_ui()->GetWebContents(), NULL, "signin-frame"); |
frame->ExecuteJavaScript(base::ASCIIToUTF16(code)); |
// Test properties are cleared in HandleCompleteLogin because the form |