From 686053baf64d047bdcc4a4a252be96ef9bc4d82c Mon Sep 17 00:00:00 2001 From: sdefresne Date: Thu, 1 Oct 2015 09:34:33 -0700 Subject: Support null callbacks in BookmarkLoadDetails::LoadExtraNodes(). When building without policy support ("configuration_policy" is 0) there will be no extra nodes to load and the load_extra_callback_ will be null. Add support for this case. BUG=None Review URL: https://codereview.chromium.org/1376233004 Cr-Commit-Position: refs/heads/master@{#351818} --- components/bookmarks/browser/bookmark_storage.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'components/bookmarks/browser/bookmark_storage.cc') diff --git a/components/bookmarks/browser/bookmark_storage.cc b/components/bookmarks/browser/bookmark_storage.cc index c2e4848..da721b1 100644 --- a/components/bookmarks/browser/bookmark_storage.cc +++ b/components/bookmarks/browser/bookmark_storage.cc @@ -135,7 +135,8 @@ BookmarkLoadDetails::~BookmarkLoadDetails() { } void BookmarkLoadDetails::LoadExtraNodes() { - extra_nodes_ = load_extra_callback_.Run(&max_id_); + if (!load_extra_callback_.is_null()) + extra_nodes_ = load_extra_callback_.Run(&max_id_); } // BookmarkStorage ------------------------------------------------------------- -- cgit v1.1