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

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

Issue 2970463002: ChromeOS: Enable Gaia v2 API by default. (Closed)
Patch Set: Created 3 years, 5 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h" 5 #include "chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h"
6 6
7 #include "ash/system/devicetype_utils.h" 7 #include "ash/system/devicetype_utils.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/callback.h" 9 #include "base/callback.h"
10 #include "base/feature_list.h" 10 #include "base/feature_list.h"
(...skipping 337 matching lines...) Expand 10 before | Expand all | Expand 10 after
348 if (command_line->HasSwitch(switches::kEafePath)) 348 if (command_line->HasSwitch(switches::kEafePath))
349 eafe_path = command_line->GetSwitchValueASCII(switches::kEafePath); 349 eafe_path = command_line->GetSwitchValueASCII(switches::kEafePath);
350 350
351 params.SetString("gaiaUrl", eafe_url); 351 params.SetString("gaiaUrl", eafe_url);
352 params.SetString("gaiaPath", eafe_path); 352 params.SetString("gaiaPath", eafe_path);
353 } 353 }
354 354
355 if (base::CommandLine::ForCurrentProcess()->HasSwitch( 355 if (base::CommandLine::ForCurrentProcess()->HasSwitch(
356 switches::kCrosGaiaApiV1)) { 356 switches::kCrosGaiaApiV1)) {
357 params.SetString("chromeOSApiVersion", "1"); 357 params.SetString("chromeOSApiVersion", "1");
358 } else if (use_easy_bootstrap_) { 358 } else if (use_easy_bootstrap_) {
jdufault 2017/06/30 18:48:19 Can this be // Easy bootstrap is not v2-compati
Alexander Alekseev 2017/06/30 22:37:37 Done.
359 // Easy bootstrap is not v2-compatible 359 // Easy bootstrap is not v2-compatible
360 params.SetString("chromeOSApiVersion", "1"); 360 params.SetString("chromeOSApiVersion", "1");
361 } else {
362 // This enables GLIF MM UI for the online Gaia screen by default.
363 // (see https://crbug.com/709244 ).
364 params.SetString("chromeOSApiVersion", "2");
361 } 365 }
362 366
363 frame_state_ = FRAME_STATE_LOADING; 367 frame_state_ = FRAME_STATE_LOADING;
364 CallJS("loadAuthExtension", params); 368 CallJS("loadAuthExtension", params);
365 } 369 }
366 370
367 void GaiaScreenHandler::ReloadGaia(bool force_reload) { 371 void GaiaScreenHandler::ReloadGaia(bool force_reload) {
368 if (frame_state_ == FRAME_STATE_LOADING && !force_reload) { 372 if (frame_state_ == FRAME_STATE_LOADING && !force_reload) {
369 VLOG(1) << "Skipping reloading of Gaia since gaia is loading."; 373 VLOG(1) << "Skipping reloading of Gaia since gaia is loading.";
370 return; 374 return;
(...skipping 620 matching lines...) Expand 10 before | Expand all | Expand 10 after
991 SigninScreenHandlerDelegate* GaiaScreenHandler::Delegate() { 995 SigninScreenHandlerDelegate* GaiaScreenHandler::Delegate() {
992 return signin_screen_handler_->delegate_; 996 return signin_screen_handler_->delegate_;
993 } 997 }
994 998
995 bool GaiaScreenHandler::IsRestrictiveProxy() const { 999 bool GaiaScreenHandler::IsRestrictiveProxy() const {
996 return !disable_restrictive_proxy_check_for_test_ && 1000 return !disable_restrictive_proxy_check_for_test_ &&
997 !IsOnline(captive_portal_status_); 1001 !IsOnline(captive_portal_status_);
998 } 1002 }
999 1003
1000 } // namespace chromeos 1004 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698