[Offline Pages] Delete associated page along with bookmark.

components/bookmarks/browser/bookmark_model.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/bookmarks/browser/bookmark_model.h"
 
 #include <algorithm>
 #include <functional>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/i18n/string_compare.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/profiler/scoped_tracker.h"
 #include "base/strings/string_util.h"
 #include "components/bookmarks/browser/bookmark_expanded_state_tracker.h"
 #include "components/bookmarks/browser/bookmark_index.h"
 #include "components/bookmarks/browser/bookmark_match.h"
 #include "components/bookmarks/browser/bookmark_model_observer.h"
 #include "components/bookmarks/browser/bookmark_node_data.h"
 #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/offline_page_bookmark_observer.h"
 #include "components/favicon_base/favicon_types.h"
 #include "grit/components_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/favicon_size.h"
 
 using base::Time;
 
 namespace bookmarks {
 
 namespace {
@@ skipping 63 matching lines @@
                              int index,
                              std::unique_ptr<BookmarkNode> node) override {}
 
   DISALLOW_COPY_AND_ASSIGN(EmptyUndoDelegate);
 };
 
 }  // namespace
 
 // BookmarkModel --------------------------------------------------------------
 
-BookmarkModel::BookmarkModel(std::unique_ptr<BookmarkClient> client)
+BookmarkModel::BookmarkModel(
+    std::unique_ptr<BookmarkClient> client,
+    std::unique_ptr<OfflinePageBookmarkObserver> offline_page_observer)
     : client_(std::move(client)),
+      offline_page_observer_(std::move(offline_page_observer)),

[sky, 2016/08/29 23:02:43]

Why do you need OfflinePageBookmarkObserver bake into the BookmarkModel? Can't
you create the OfflinePageBookmarkObserver as necessary once BookmarkModel is
created?

[romax, 2016/08/29 23:21:24]

Because I was thinking that it's better for the BookmarkModel to own this
Observer, so that no events would be missed and the OfflinePageModel can load
lazily.
Sorry if I misunderstood your questions. But is it your main concern that the
BookmarkModel owns the observer or it is part of the constructor? I guess I can
use a setter here to avoid changes to the constructor...

       loaded_(false),
       root_(GURL()),
       bookmark_bar_node_(NULL),
       other_node_(NULL),
       mobile_node_(NULL),
       next_node_id_(1),
       observers_(
           base::ObserverList<BookmarkModelObserver>::NOTIFY_EXISTING_ONLY),
       loaded_signal_(base::WaitableEvent::ResetPolicy::MANUAL,
                      base::WaitableEvent::InitialState::NOT_SIGNALED),
       extensive_changes_(0),
       undo_delegate_(nullptr),
       empty_undo_delegate_(new EmptyUndoDelegate) {
   DCHECK(client_);
   client_->Init(this);
+  if (offline_page_observer_)
+    AddObserver(offline_page_observer_.get());
 }
 
 BookmarkModel::~BookmarkModel() {
   FOR_EACH_OBSERVER(BookmarkModelObserver, observers_,
                     BookmarkModelBeingDeleted(this));
 
   if (store_.get()) {
     // The store maintains a reference back to us. We need to tell it we're gone
     // so that it doesn't try and invoke a method back on us again.
     store_->BookmarkModelDeleted();
@@ skipping 968 matching lines @@
   undo_delegate_ = undo_delegate;
   if (undo_delegate_)
     undo_delegate_->SetUndoProvider(this);
 }
 
 BookmarkUndoDelegate* BookmarkModel::undo_delegate() const {
   return undo_delegate_ ? undo_delegate_ : empty_undo_delegate_.get();
 }
 
 }  // namespace bookmarks