Commit 557d4cfd authored by Sergio Villar Senin's avatar Sergio Villar Senin Committed by Commit Bot

Convert chrome/browser/signin/signin_global_error.cc to IdentityManager

It was using SigninManagerBase API to get the primary (authenticated)
account id. It's now using the IdentityManager API.

Bug: 890792
Change-Id: Ia8cdd8e491f29256af2c015a9127b0766e81b99e
Reviewed-on: https://chromium-review.googlesource.com/c/1276965
Commit-Queue: Sergio Villar <svillar@igalia.com>
Reviewed-by: default avatarMihai Sardarescu <msarda@chromium.org>
Cr-Commit-Position: refs/heads/master@{#599173}
parent 1454ad1f
......@@ -9,7 +9,7 @@
#include "build/build_config.h"
#include "chrome/app/chrome_command_ids.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/signin/signin_manager_factory.h"
#include "chrome/browser/signin/identity_manager_factory.h"
#include "chrome/browser/ui/browser_commands.h"
#include "chrome/browser/ui/browser_window.h"
#include "chrome/browser/ui/chrome_pages.h"
......@@ -23,9 +23,9 @@
#include "chrome/grit/generated_resources.h"
#include "components/signin/core/browser/profile_management_switches.h"
#include "components/signin/core/browser/signin_header_helper.h"
#include "components/signin/core/browser/signin_manager.h"
#include "components/signin/core/browser/signin_metrics.h"
#include "net/base/url_util.h"
#include "services/identity/public/cpp/identity_manager.h"
#include "ui/base/l10n/l10n_util.h"
#if !defined(OS_ANDROID)
......@@ -116,10 +116,10 @@ std::vector<base::string16> SigninGlobalError::GetBubbleViewMessages() {
std::vector<base::string16> messages;
// If the user isn't signed in, no need to display an error bubble.
SigninManagerBase* signin_manager =
SigninManagerFactory::GetForProfileIfExists(profile_);
if (signin_manager && !signin_manager->IsAuthenticated())
return messages;
auto* identity_manager =
IdentityManagerFactory::GetForProfileIfExists(profile_);
if (identity_manager && !identity_manager->HasPrimaryAccount())
return messages;
if (!error_controller_->HasError())
return messages;
......
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