diff options
| author | sdefresne <sdefresne@chromium.org> | 2015-10-01 09:34:33 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-01 16:35:58 +0000 |
| commit | 686053baf64d047bdcc4a4a252be96ef9bc4d82c (patch) | |
| tree | f4c257a6aed5aaf89dc8963de38437ab1f13d719 | |
| parent | 2cfb6d58a971b3ca3ba404ef4403394d5ccdc68f (diff) | |
| download | chromium_src-686053baf64d047bdcc4a4a252be96ef9bc4d82c.zip chromium_src-686053baf64d047bdcc4a4a252be96ef9bc4d82c.tar.gz chromium_src-686053baf64d047bdcc4a4a252be96ef9bc4d82c.tar.bz2 | |
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}
| -rw-r--r-- | components/bookmarks/browser/bookmark_storage.cc | 3 |
1 files changed, 2 insertions, 1 deletions
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 ------------------------------------------------------------- |