| OLD | NEW |
| 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/signin/inline_login_handler_impl.h" | 5 #include "chrome/browser/ui/webui/signin/inline_login_handler_impl.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <string> | 9 #include <string> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 520 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 531 return true; | 531 return true; |
| 532 | 532 |
| 533 // If the signin manager already has an authenticated name, then this is a | 533 // If the signin manager already has an authenticated name, then this is a |
| 534 // re-auth scenario. Make sure the email just signed in corresponds to | 534 // re-auth scenario. Make sure the email just signed in corresponds to |
| 535 // the one sign in manager expects. | 535 // the one sign in manager expects. |
| 536 std::string current_email = manager->GetAuthenticatedAccountInfo().email; | 536 std::string current_email = manager->GetAuthenticatedAccountInfo().email; |
| 537 const bool same_email = gaia::AreEmailsSame(current_email, email); | 537 const bool same_email = gaia::AreEmailsSame(current_email, email); |
| 538 if (!current_email.empty() && !same_email) { | 538 if (!current_email.empty() && !same_email) { |
| 539 UMA_HISTOGRAM_ENUMERATION("Signin.Reauth", | 539 UMA_HISTOGRAM_ENUMERATION("Signin.Reauth", |
| 540 signin_metrics::HISTOGRAM_ACCOUNT_MISSMATCH, | 540 signin_metrics::HISTOGRAM_ACCOUNT_MISSMATCH, |
| 541 signin_metrics::HISTOGRAM_MAX); | 541 signin_metrics::HISTOGRAM_REAUTH_MAX); |
| 542 if (error_message) { | 542 if (error_message) { |
| 543 error_message->assign( | 543 error_message->assign( |
| 544 l10n_util::GetStringFUTF8(IDS_SYNC_WRONG_EMAIL, | 544 l10n_util::GetStringFUTF8(IDS_SYNC_WRONG_EMAIL, |
| 545 base::UTF8ToUTF16(current_email))); | 545 base::UTF8ToUTF16(current_email))); |
| 546 } | 546 } |
| 547 return false; | 547 return false; |
| 548 } | 548 } |
| 549 | 549 |
| 550 // If some profile, not just the current one, is already connected to this | 550 // If some profile, not just the current one, is already connected to this |
| 551 // account, don't show the infobar. | 551 // account, don't show the infobar. |
| (...skipping 381 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 933 } | 933 } |
| 934 | 934 |
| 935 if (show_account_management) { | 935 if (show_account_management) { |
| 936 browser->window()->ShowAvatarBubbleFromAvatarButton( | 936 browser->window()->ShowAvatarBubbleFromAvatarButton( |
| 937 BrowserWindow::AVATAR_BUBBLE_MODE_ACCOUNT_MANAGEMENT, | 937 BrowserWindow::AVATAR_BUBBLE_MODE_ACCOUNT_MANAGEMENT, |
| 938 signin::ManageAccountsParams(), | 938 signin::ManageAccountsParams(), |
| 939 signin_metrics::AccessPoint::ACCESS_POINT_AVATAR_BUBBLE_SIGN_IN); | 939 signin_metrics::AccessPoint::ACCESS_POINT_AVATAR_BUBBLE_SIGN_IN); |
| 940 } | 940 } |
| 941 } | 941 } |
| 942 } | 942 } |
| OLD | NEW |