Commit ea667920 authored by Julie Jeongeun Kim's avatar Julie Jeongeun Kim Committed by Commit Bot

[s13n] Move signin_view_controller.cc away from using AccountTrackerService

This CL removes AccountTrackerService from signin_view_controller.cc
and uses IdentityManager instead of it.

Bug: 922780
Change-Id: I3bfa8dcfa8cc3722868b9726526357c1c7a9f223
Reviewed-on: https://chromium-review.googlesource.com/c/1436618Reviewed-by: default avatarColin Blundell <blundell@chromium.org>
Reviewed-by: default avatarMihai Sardarescu <msarda@chromium.org>
Commit-Queue: Julie Jeongeun Kim <jkim@igalia.com>
Cr-Commit-Position: refs/heads/master@{#626296}
parent 242bf92b
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
#include "chrome/browser/search/search.h" #include "chrome/browser/search/search.h"
#include "chrome/browser/search_engines/ui_thread_search_terms_data.h" #include "chrome/browser/search_engines/ui_thread_search_terms_data.h"
#include "chrome/browser/signin/account_consistency_mode_manager.h" #include "chrome/browser/signin/account_consistency_mode_manager.h"
#include "chrome/browser/signin/account_tracker_service_factory.h"
#include "chrome/browser/signin/dice_tab_helper.h" #include "chrome/browser/signin/dice_tab_helper.h"
#include "chrome/browser/signin/identity_manager_factory.h" #include "chrome/browser/signin/identity_manager_factory.h"
#include "chrome/browser/signin/signin_promo.h" #include "chrome/browser/signin/signin_promo.h"
...@@ -81,12 +80,12 @@ int FindDiceSigninTab(TabStripModel* tab_strip) { ...@@ -81,12 +80,12 @@ int FindDiceSigninTab(TabStripModel* tab_strip) {
// Returns the promo action to be used when signing with a new account. // Returns the promo action to be used when signing with a new account.
signin_metrics::PromoAction GetPromoActionForNewAccount( signin_metrics::PromoAction GetPromoActionForNewAccount(
AccountTrackerService* account_tracker, identity::IdentityManager* identity_manager,
signin::AccountConsistencyMethod account_consistency) { signin::AccountConsistencyMethod account_consistency) {
if (account_consistency != signin::AccountConsistencyMethod::kDice) if (account_consistency != signin::AccountConsistencyMethod::kDice)
return signin_metrics::PromoAction::PROMO_ACTION_NEW_ACCOUNT_PRE_DICE; return signin_metrics::PromoAction::PROMO_ACTION_NEW_ACCOUNT_PRE_DICE;
return account_tracker->GetAccounts().size() > 0 return identity_manager->GetAccountsWithRefreshTokens().size() > 0
? signin_metrics::PromoAction:: ? signin_metrics::PromoAction::
PROMO_ACTION_NEW_ACCOUNT_EXISTING_ACCOUNT PROMO_ACTION_NEW_ACCOUNT_EXISTING_ACCOUNT
: signin_metrics::PromoAction:: : signin_metrics::PromoAction::
...@@ -125,8 +124,7 @@ void SigninViewController::ShowSignin(profiles::BubbleViewMode mode, ...@@ -125,8 +124,7 @@ void SigninViewController::ShowSignin(profiles::BubbleViewMode mode,
email = manager->GetPrimaryAccountInfo().email; email = manager->GetPrimaryAccountInfo().email;
} }
signin_metrics::PromoAction promo_action = GetPromoActionForNewAccount( signin_metrics::PromoAction promo_action = GetPromoActionForNewAccount(
AccountTrackerServiceFactory::GetForProfile(profile), IdentityManagerFactory::GetForProfile(profile), account_consistency);
account_consistency);
ShowDiceSigninTab(browser, signin_reason, access_point, promo_action, email, ShowDiceSigninTab(browser, signin_reason, access_point, promo_action, email,
redirect_url); redirect_url);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment