Commit dfa24463 authored by Mario Sanchez Prada's avatar Mario Sanchez Prada Committed by Commit Bot

Migrate SyncedBookmarksObserverBridge to the IdentityManager

Replace usage of SigninManagerBase::IsAuthenticated with
IdentityManager::HasPrimaryAccount().

Bug: 903840
Change-Id: I907301ebe26df1a1b7c718a30ec0051b26a5ad55
Reviewed-on: https://chromium-review.googlesource.com/c/1332300Reviewed-by: default avatarSylvain Defresne <sdefresne@chromium.org>
Reviewed-by: default avatarSergio Collazos <sczs@chromium.org>
Commit-Queue: Mario Sanchez Prada <mario@igalia.com>
Cr-Commit-Position: refs/heads/master@{#607645}
parent cfeacb30
...@@ -10,10 +10,13 @@ ...@@ -10,10 +10,13 @@
#include "base/macros.h" #include "base/macros.h"
#import "ios/chrome/browser/sync/sync_observer_bridge.h" #import "ios/chrome/browser/sync/sync_observer_bridge.h"
namespace identity {
class IdentityManager;
}
namespace ios { namespace ios {
class ChromeBrowserState; class ChromeBrowserState;
} }
class SigninManager;
namespace sync_bookmarks { namespace sync_bookmarks {
...@@ -30,7 +33,7 @@ class SyncedBookmarksObserverBridge : public SyncObserverBridge { ...@@ -30,7 +33,7 @@ class SyncedBookmarksObserverBridge : public SyncObserverBridge {
bool IsPerformingInitialSync(); bool IsPerformingInitialSync();
private: private:
SigninManager* signin_manager_; identity::IdentityManager* identity_manager_;
ios::ChromeBrowserState* browser_state_; ios::ChromeBrowserState* browser_state_;
DISALLOW_COPY_AND_ASSIGN(SyncedBookmarksObserverBridge); DISALLOW_COPY_AND_ASSIGN(SyncedBookmarksObserverBridge);
......
...@@ -5,12 +5,12 @@ ...@@ -5,12 +5,12 @@
#import "ios/chrome/browser/ui/bookmarks/synced_bookmarks_bridge.h" #import "ios/chrome/browser/ui/bookmarks/synced_bookmarks_bridge.h"
#include "components/browser_sync/profile_sync_service.h" #include "components/browser_sync/profile_sync_service.h"
#include "components/signin/core/browser/signin_manager.h"
#include "ios/chrome/browser/browser_state/chrome_browser_state.h" #include "ios/chrome/browser/browser_state/chrome_browser_state.h"
#include "ios/chrome/browser/signin/signin_manager_factory.h" #include "ios/chrome/browser/signin/identity_manager_factory.h"
#include "ios/chrome/browser/sync/profile_sync_service_factory.h" #include "ios/chrome/browser/sync/profile_sync_service_factory.h"
#include "ios/chrome/browser/sync/sync_setup_service.h" #include "ios/chrome/browser/sync/sync_setup_service.h"
#include "ios/chrome/browser/sync/sync_setup_service_factory.h" #include "ios/chrome/browser/sync/sync_setup_service_factory.h"
#include "services/identity/public/cpp/identity_manager.h"
#if !defined(__has_feature) || !__has_feature(objc_arc) #if !defined(__has_feature) || !__has_feature(objc_arc)
#error "This file requires ARC support." #error "This file requires ARC support."
...@@ -26,8 +26,8 @@ SyncedBookmarksObserverBridge::SyncedBookmarksObserverBridge( ...@@ -26,8 +26,8 @@ SyncedBookmarksObserverBridge::SyncedBookmarksObserverBridge(
: SyncObserverBridge( : SyncObserverBridge(
delegate, delegate,
ProfileSyncServiceFactory::GetForBrowserState(browserState)), ProfileSyncServiceFactory::GetForBrowserState(browserState)),
signin_manager_( identity_manager_(
ios::SigninManagerFactory::GetForBrowserState(browserState)), IdentityManagerFactory::GetForBrowserState(browserState)),
browser_state_(browserState) {} browser_state_(browserState) {}
SyncedBookmarksObserverBridge::~SyncedBookmarksObserverBridge() {} SyncedBookmarksObserverBridge::~SyncedBookmarksObserverBridge() {}
...@@ -35,7 +35,7 @@ SyncedBookmarksObserverBridge::~SyncedBookmarksObserverBridge() {} ...@@ -35,7 +35,7 @@ SyncedBookmarksObserverBridge::~SyncedBookmarksObserverBridge() {}
#pragma mark - Signin and syncing status #pragma mark - Signin and syncing status
bool SyncedBookmarksObserverBridge::IsSignedIn() { bool SyncedBookmarksObserverBridge::IsSignedIn() {
return signin_manager_->IsAuthenticated(); return identity_manager_->HasPrimaryAccount();
} }
bool SyncedBookmarksObserverBridge::IsPerformingInitialSync() { bool SyncedBookmarksObserverBridge::IsPerformingInitialSync() {
......
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