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

Side by Side Diff: chrome/browser/resources/chromeos/login/screen_gaia_signin.js

Issue 145073003: Indicate which authentication flow was used in UserContext (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Speculative fix for telemetry. Created 6 years, 11 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 /** 5 /**
6 * @fileoverview Oobe signin screen implementation. 6 * @fileoverview Oobe signin screen implementation.
7 */ 7 */
8 8
9 <include src="../../gaia_auth_host/gaia_auth_host.js"></include> 9 <include src="../../gaia_auth_host/gaia_auth_host.js"></include>
10 10
(...skipping 404 matching lines...) Expand 10 before | Expand all | Expand 10 after
415 this.email = credentials.email; 415 this.email = credentials.email;
416 chrome.send('authenticateUser', 416 chrome.send('authenticateUser',
417 [credentials.email, credentials.password]); 417 [credentials.email, credentials.password]);
418 } else if (credentials.authCode) { 418 } else if (credentials.authCode) {
419 chrome.send('completeAuthentication', 419 chrome.send('completeAuthentication',
420 [credentials.email, 420 [credentials.email,
421 credentials.password, 421 credentials.password,
422 credentials.authCode]); 422 credentials.authCode]);
423 } else { 423 } else {
424 chrome.send('completeLogin', 424 chrome.send('completeLogin',
425 [credentials.email, credentials.password]); 425 [credentials.email,
426 credentials.password,
427 credentials.usingSAML]);
426 } 428 }
427 429
428 this.loading = true; 430 this.loading = true;
429 // Now that we're in logged in state header should be hidden. 431 // Now that we're in logged in state header should be hidden.
430 Oobe.getInstance().headerHidden = true; 432 Oobe.getInstance().headerHidden = true;
431 // Clear any error messages that were shown before login. 433 // Clear any error messages that were shown before login.
432 Oobe.clearErrors(); 434 Oobe.clearErrors();
433 }, 435 },
434 436
435 /** 437 /**
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
545 * Handler for iframe's error notification coming from the outside. 547 * Handler for iframe's error notification coming from the outside.
546 * For more info see C++ class 'SnifferObserver' which calls this method. 548 * For more info see C++ class 'SnifferObserver' which calls this method.
547 * @param {number} error Error code. 549 * @param {number} error Error code.
548 */ 550 */
549 onFrameError: function(error) { 551 onFrameError: function(error) {
550 this.error_ = error; 552 this.error_ = error;
551 chrome.send('frameLoadingCompleted', [this.error_]); 553 chrome.send('frameLoadingCompleted', [this.error_]);
552 }, 554 },
553 }; 555 };
554 }); 556 });
OLDNEW
« no previous file with comments | « chrome/browser/resources/chromeos/login/login_common.js ('k') | chrome/browser/resources/gaia_auth/main.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698