| Index: components/bookmarks/browser/bookmark_model.cc
|
| diff --git a/components/bookmarks/browser/bookmark_model.cc b/components/bookmarks/browser/bookmark_model.cc
|
| index 8d5b238a0c9a1d8cb90266e87f85b2d268dfb6d8..8519d268026c5177b7056bf612e31518716c87a5 100644
|
| --- a/components/bookmarks/browser/bookmark_model.cc
|
| +++ b/components/bookmarks/browser/bookmark_model.cc
|
| @@ -24,6 +24,7 @@
|
| #include "components/bookmarks/browser/bookmark_storage.h"
|
| #include "components/bookmarks/browser/bookmark_undo_delegate.h"
|
| #include "components/bookmarks/browser/bookmark_utils.h"
|
| +#include "components/bookmarks/browser/owned_bookmark_model_observer.h"
|
| #include "components/favicon_base/favicon_types.h"
|
| #include "grit/components_strings.h"
|
| #include "ui/base/l10n/l10n_util.h"
|
| @@ -107,8 +108,11 @@ class EmptyUndoDelegate : public BookmarkUndoDelegate {
|
|
|
| // BookmarkModel --------------------------------------------------------------
|
|
|
| -BookmarkModel::BookmarkModel(std::unique_ptr<BookmarkClient> client)
|
| +BookmarkModel::BookmarkModel(
|
| + std::unique_ptr<BookmarkClient> client,
|
| + std::unique_ptr<OwnedBookmarkModelObserver> offline_page_observer)
|
| : client_(std::move(client)),
|
| + offline_page_observer_(std::move(offline_page_observer)),
|
| loaded_(false),
|
| root_(GURL()),
|
| bookmark_bar_node_(NULL),
|
| @@ -124,6 +128,8 @@ BookmarkModel::BookmarkModel(std::unique_ptr<BookmarkClient> client)
|
| empty_undo_delegate_(new EmptyUndoDelegate) {
|
| DCHECK(client_);
|
| client_->Init(this);
|
| + if (offline_page_observer_)
|
| + AddObserver(offline_page_observer_.get());
|
| }
|
|
|
| BookmarkModel::~BookmarkModel() {
|
|
|