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

Unified Diff: chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc

Issue 296173008: Added ability to use new GAIA endpoint on CrOS login screen. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased again. Created 6 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/resources/chromeos/login/screen_gaia_signin.js ('k') | chromeos/chromeos_switches.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 c0a08b08b884d1d5f46a0e2f411337ad1211d922..7ac9edf8140ab7d15404166d59c4aaa6aea3d7a9 100644
--- a/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc
@@ -11,6 +11,7 @@
#include "chrome/browser/chromeos/login/users/user_manager.h"
#include "chrome/browser/chromeos/settings/cros_settings.h"
#include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
+#include "chromeos/chromeos_switches.h"
#include "chromeos/settings/cros_settings_names.h"
#include "google_apis/gaia/gaia_switches.h"
#include "google_apis/gaia/gaia_urls.h"
@@ -138,13 +139,17 @@ void GaiaScreenHandler::LoadGaia(const GaiaContext& context) {
params.Set("localizedStrings", localized_strings);
}
+ CommandLine* command_line = CommandLine::ForCurrentProcess();
+
const GURL gaia_url =
- CommandLine::ForCurrentProcess()->HasSwitch(::switches::kGaiaUrl)
- ? GURL(CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
- ::switches::kGaiaUrl))
+ command_line->HasSwitch(::switches::kGaiaUrl)
+ ? GURL(command_line->GetSwitchValueASCII(::switches::kGaiaUrl))
: GaiaUrls::GetInstance()->gaia_url();
params.SetString("gaiaUrl", gaia_url.spec());
+ if (command_line->HasSwitch(chromeos::switches::kEnableEmbeddedSignin))
+ params.SetBoolean("useEmbedded", true);
+
frame_state_ = FRAME_STATE_LOADING;
CallJS("loadAuthExtension", params);
}
« no previous file with comments | « chrome/browser/resources/chromeos/login/screen_gaia_signin.js ('k') | chromeos/chromeos_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698