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

Side by Side Diff: chrome/browser/ui/sync/one_click_signin_helper.cc

Issue 300523003: Fix some problems with new reauth: (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address review comments Created 6 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 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 #include "chrome/browser/ui/sync/one_click_signin_helper.h" 5 #include "chrome/browser/ui/sync/one_click_signin_helper.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <functional> 8 #include <functional>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 731 matching lines...) Expand 10 before | Expand all | Expand 10 after
742 one_click_signin::HISTOGRAM_MAX); 742 one_click_signin::HISTOGRAM_MAX);
743 break; 743 break;
744 case signin::SOURCE_AVATAR_BUBBLE_ADD_ACCOUNT: 744 case signin::SOURCE_AVATAR_BUBBLE_ADD_ACCOUNT:
745 UMA_HISTOGRAM_ENUMERATION("Signin.AvatarBubbleActions", action, 745 UMA_HISTOGRAM_ENUMERATION("Signin.AvatarBubbleActions", action,
746 one_click_signin::HISTOGRAM_MAX); 746 one_click_signin::HISTOGRAM_MAX);
747 break; 747 break;
748 case signin::SOURCE_DEVICES_PAGE: 748 case signin::SOURCE_DEVICES_PAGE:
749 UMA_HISTOGRAM_ENUMERATION("Signin.DevicesPageActions", action, 749 UMA_HISTOGRAM_ENUMERATION("Signin.DevicesPageActions", action,
750 one_click_signin::HISTOGRAM_MAX); 750 one_click_signin::HISTOGRAM_MAX);
751 break; 751 break;
752 case signin::SOURCE_REAUTH:
753 UMA_HISTOGRAM_ENUMERATION("Signin.ReauthActions", action,
754 one_click_signin::HISTOGRAM_MAX);
755 break;
752 default: 756 default:
753 // This switch statement needs to be updated when the enum Source changes. 757 // This switch statement needs to be updated when the enum Source changes.
754 COMPILE_ASSERT(signin::SOURCE_UNKNOWN == 12, 758 COMPILE_ASSERT(signin::SOURCE_UNKNOWN == 13,
755 kSourceEnumHasChangedButNotThisSwitchStatement); 759 kSourceEnumHasChangedButNotThisSwitchStatement);
756 UMA_HISTOGRAM_ENUMERATION("Signin.UnknownActions", action, 760 UMA_HISTOGRAM_ENUMERATION("Signin.UnknownActions", action,
757 one_click_signin::HISTOGRAM_MAX); 761 one_click_signin::HISTOGRAM_MAX);
758 } 762 }
759 UMA_HISTOGRAM_ENUMERATION("Signin.AllAccessPointActions", action, 763 UMA_HISTOGRAM_ENUMERATION("Signin.AllAccessPointActions", action,
760 one_click_signin::HISTOGRAM_MAX); 764 one_click_signin::HISTOGRAM_MAX);
761 } 765 }
762 766
763 // static 767 // static
764 void OneClickSigninHelper::CreateForWebContentsWithPasswordManager( 768 void OneClickSigninHelper::CreateForWebContentsWithPasswordManager(
(...skipping 832 matching lines...) Expand 10 before | Expand all | Expand 10 after
1597 // If the web contents is showing a blank page and not about to be closed, 1601 // If the web contents is showing a blank page and not about to be closed,
1598 // redirect to the NTP or apps page. 1602 // redirect to the NTP or apps page.
1599 if (signin::IsContinueUrlForWebBasedSigninFlow(current_url) && 1603 if (signin::IsContinueUrlForWebBasedSigninFlow(current_url) &&
1600 !signin::IsAutoCloseEnabledInURL(original_continue_url_)) { 1604 !signin::IsAutoCloseEnabledInURL(original_continue_url_)) {
1601 RedirectToNtpOrAppsPage( 1605 RedirectToNtpOrAppsPage(
1602 web_contents(), 1606 web_contents(),
1603 signin::GetSourceForPromoURL(original_continue_url_)); 1607 signin::GetSourceForPromoURL(original_continue_url_));
1604 } 1608 }
1605 } 1609 }
1606 } 1610 }
OLDNEW
« no previous file with comments | « chrome/browser/signin/signin_promo.cc ('k') | chrome/browser/ui/webui/signin/inline_login_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698