| 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 88d1809a9abd3acf5daf281fb3c848f03445b8dd..0f10fc1ecbb8fc7d56234c76a8e1dee36beb1dd1 100644
|
| --- a/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc
|
| +++ b/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc
|
| @@ -352,12 +352,15 @@ void GaiaScreenHandler::LoadGaiaWithVersion(
|
| params.SetString("gaiaPath", eafe_path);
|
| }
|
|
|
| + // Easy bootstrap is not v2-compatible
|
| if (base::CommandLine::ForCurrentProcess()->HasSwitch(
|
| - switches::kCrosGaiaApiV1)) {
|
| - params.SetString("chromeOSApiVersion", "1");
|
| - } else if (use_easy_bootstrap_) {
|
| - // Easy bootstrap is not v2-compatible
|
| + switches::kCrosGaiaApiV1) ||
|
| + use_easy_bootstrap_) {
|
| params.SetString("chromeOSApiVersion", "1");
|
| + } else {
|
| + // This enables GLIF MM UI for the online Gaia screen by default.
|
| + // (see https://crbug.com/709244 ).
|
| + params.SetString("chromeOSApiVersion", "2");
|
| }
|
|
|
| frame_state_ = FRAME_STATE_LOADING;
|
|
|