| 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..a7ff8438f3c424d932bb6b597ef5ff04889d5e1a 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"
|
| @@ -35,6 +35,9 @@ namespace chromeos {
|
| namespace {
|
|
|
| const char kJsScreenPath[] = "login.GaiaSigninScreen";
|
| +const char kAuthIframeParentName[] = "signin-frame";
|
| +const char kAuthIframeParentOrigin[] =
|
| + "chrome-extension://mfffpogegjflfpflabcdkioaeobkgjik/";
|
|
|
| void UpdateAuthParams(base::DictionaryValue* params, bool has_users) {
|
| CrosSettings* cros_settings = CrosSettings::Get();
|
| @@ -328,8 +331,10 @@ 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::GetAuthIframe(
|
| + web_ui()->GetWebContents(),
|
| + GURL(kAuthIframeParentOrigin),
|
| + kAuthIframeParentName);
|
| frame->ExecuteJavaScript(base::ASCIIToUTF16(code));
|
| }
|
| if (gaia_silent_load_) {
|
| @@ -340,8 +345,10 @@ 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::GetAuthIframe(
|
| + web_ui()->GetWebContents(),
|
| + GURL(kAuthIframeParentOrigin),
|
| + kAuthIframeParentName);
|
| frame->ExecuteJavaScript(base::ASCIIToUTF16(code));
|
|
|
| // As we could miss and window.onload could already be called, restore
|
| @@ -430,8 +437,10 @@ 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::GetAuthIframe(
|
| + web_ui()->GetWebContents(),
|
| + GURL(kAuthIframeParentOrigin),
|
| + kAuthIframeParentName);
|
| frame->ExecuteJavaScript(base::ASCIIToUTF16(code));
|
|
|
| // Test properties are cleared in HandleCompleteLogin because the form
|
|
|