summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcramya@chromium.org <cramya@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-05 03:26:56 +0000
committercramya@chromium.org <cramya@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-05 03:26:56 +0000
commit73ba2b7f5484eb1b6769b4f9a33e8c18c8219c09 (patch)
tree990ad9d0c003aaa867b988c53b30729943a1cc85
parent79982b6ebef6be4b57d76797316ad1e5c32a4574 (diff)
downloadchromium_src-73ba2b7f5484eb1b6769b4f9a33e8c18c8219c09.zip
chromium_src-73ba2b7f5484eb1b6769b4f9a33e8c18c8219c09.tar.gz
chromium_src-73ba2b7f5484eb1b6769b4f9a33e8c18c8219c09.tar.bz2
Add null check for SigninManagerFactory::GetForProfile(profile)
BUG=324862 Review URL: https://codereview.chromium.org/102033003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@238875 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/android/bookmarks/bookmarks_bridge.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/android/bookmarks/bookmarks_bridge.cc b/chrome/browser/android/bookmarks/bookmarks_bridge.cc
index e9700dc..2067e53 100644
--- a/chrome/browser/android/bookmarks/bookmarks_bridge.cc
+++ b/chrome/browser/android/bookmarks/bookmarks_bridge.cc
@@ -298,10 +298,11 @@ bool BookmarksBridge::IsLoaded() const {
bool BookmarksBridge::IsFolderAvailable(
const BookmarkNode* folder) const {
+ SigninManager* signin = SigninManagerFactory::GetForProfile(
+ profile_->GetOriginalProfile());
return (folder->type() != BookmarkNode::BOOKMARK_BAR &&
folder->type() != BookmarkNode::OTHER_NODE) ||
- !SigninManagerFactory::GetForProfile(
- profile_)->GetAuthenticatedUsername().empty();
+ (signin && !signin->GetAuthenticatedUsername().empty());
}
void BookmarksBridge::NotifyIfDoneLoading() {