Commit 3f3b504e authored by Antonio Gomes's avatar Antonio Gomes Committed by Commit Bot

[s13n] Convert signin_view_controller.cc to IdentityManager

BUG=889880

Change-Id: I9281596226272ff8cadff1c678136750eeb5b902
Reviewed-on: https://chromium-review.googlesource.com/c/1304576Reviewed-by: default avatarTheresa <twellington@chromium.org>
Commit-Queue: Antonio Gomes <tonikitoo@igalia.com>
Cr-Commit-Position: refs/heads/master@{#603494}
parent 9dc17401
......@@ -19,7 +19,7 @@
#include "chrome/browser/profiles/incognito_helpers.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile_android.h"
#include "chrome/browser/signin/signin_manager_factory.h"
#include "chrome/browser/signin/identity_manager_factory.h"
#include "chrome/browser/undo/bookmark_undo_service_factory.h"
#include "components/bookmarks/browser/bookmark_model.h"
#include "components/bookmarks/browser/bookmark_utils.h"
......@@ -30,11 +30,11 @@
#include "components/bookmarks/managed/managed_bookmark_service.h"
#include "components/prefs/pref_service.h"
#include "components/query_parser/query_parser.h"
#include "components/signin/core/browser/signin_manager.h"
#include "components/undo/bookmark_undo_service.h"
#include "components/undo/undo_manager.h"
#include "content/public/browser/browser_thread.h"
#include "jni/BookmarkBridge_jni.h"
#include "services/identity/public/cpp/identity_manager.h"
using base::android::AttachCurrentThread;
using base::android::ConvertUTF8ToJavaString;
......@@ -874,11 +874,11 @@ bool BookmarkBridge::IsFolderAvailable(
if (folder == managed_bookmark_service_->managed_node() && folder->empty())
return false;
SigninManager* signin = SigninManagerFactory::GetForProfile(
profile_->GetOriginalProfile());
auto* identity_manager =
IdentityManagerFactory::GetForProfile(profile_->GetOriginalProfile());
return (folder->type() != BookmarkNode::BOOKMARK_BAR &&
folder->type() != BookmarkNode::OTHER_NODE) ||
(signin && signin->IsAuthenticated());
folder->type() != BookmarkNode::OTHER_NODE) ||
(identity_manager && identity_manager->HasPrimaryAccount());
}
void BookmarkBridge::NotifyIfDoneLoading() {
......
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