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

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

Issue 2952903002: ChromeOS: Add support for Gaia v2 API to FakeGaia and screen handler. (Closed)
Patch Set: Disable v2 by default Created 3 years, 6 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 | « no previous file | google_apis/gaia/fake_gaia.cc » ('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 c296ffb1e56752c7fb4e1a7fc98bfa9cca994c4c..88d1809a9abd3acf5daf281fb3c848f03445b8dd 100644
--- a/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc
@@ -351,9 +351,13 @@ void GaiaScreenHandler::LoadGaiaWithVersion(
params.SetString("gaiaUrl", eafe_url);
params.SetString("gaiaPath", eafe_path);
}
+
if (base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kCrosGaiaApiV1)) {
params.SetString("chromeOSApiVersion", "1");
+ } else if (use_easy_bootstrap_) {
+ // Easy bootstrap is not v2-compatible
+ params.SetString("chromeOSApiVersion", "1");
}
frame_state_ = FRAME_STATE_LOADING;
« no previous file with comments | « no previous file | google_apis/gaia/fake_gaia.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698