Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(537)

Side by Side Diff: components/offline_pages/offline_page_model.cc

Issue 1986673002: [Offline Pages] Updated clearing logic in storage manager. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixing trybots. Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "components/offline_pages/offline_page_model.h" 5 #include "components/offline_pages/offline_page_model.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 return url.SchemeIsHTTPOrHTTPS(); 111 return url.SchemeIsHTTPOrHTTPS();
112 } 112 }
113 113
114 // protected 114 // protected
115 OfflinePageModel::OfflinePageModel() 115 OfflinePageModel::OfflinePageModel()
116 : is_loaded_(false), weak_ptr_factory_(this) {} 116 : is_loaded_(false), weak_ptr_factory_(this) {}
117 117
118 OfflinePageModel::OfflinePageModel( 118 OfflinePageModel::OfflinePageModel(
119 std::unique_ptr<OfflinePageMetadataStore> store, 119 std::unique_ptr<OfflinePageMetadataStore> store,
120 const base::FilePath& archives_dir, 120 const base::FilePath& archives_dir,
121 const scoped_refptr<base::SequencedTaskRunner>& task_runner) 121 const scoped_refptr<base::SequencedTaskRunner>& task_runner,
122 PrefService* prefs)
122 : store_(std::move(store)), 123 : store_(std::move(store)),
123 archives_dir_(archives_dir), 124 archives_dir_(archives_dir),
124 is_loaded_(false), 125 is_loaded_(false),
125 task_runner_(task_runner), 126 task_runner_(task_runner),
126 policy_controller_(new ClientPolicyController()), 127 policy_controller_(new ClientPolicyController()),
128 prefs_(prefs),
127 weak_ptr_factory_(this) { 129 weak_ptr_factory_(this) {
128 task_runner_->PostTaskAndReply( 130 task_runner_->PostTaskAndReply(
129 FROM_HERE, base::Bind(EnsureArchivesDirCreated, archives_dir_), 131 FROM_HERE, base::Bind(EnsureArchivesDirCreated, archives_dir_),
130 base::Bind(&OfflinePageModel::OnEnsureArchivesDirCreatedDone, 132 base::Bind(&OfflinePageModel::OnEnsureArchivesDirCreatedDone,
131 weak_ptr_factory_.GetWeakPtr(), base::TimeTicks::Now())); 133 weak_ptr_factory_.GetWeakPtr(), base::TimeTicks::Now()));
132 } 134 }
133 135
134 OfflinePageModel::~OfflinePageModel() { 136 OfflinePageModel::~OfflinePageModel() {
135 } 137 }
136 138
(...skipping 494 matching lines...) Expand 10 before | Expand all | Expand 10 after
631 // TODO(jianli): rebuild the store upon failure. 633 // TODO(jianli): rebuild the store upon failure.
632 634
633 if (load_status == OfflinePageMetadataStore::LOAD_SUCCEEDED) 635 if (load_status == OfflinePageMetadataStore::LOAD_SUCCEEDED)
634 CacheLoadedData(offline_pages); 636 CacheLoadedData(offline_pages);
635 637
636 UMA_HISTOGRAM_TIMES("OfflinePages.Model.ConstructionToLoadedEventTime", 638 UMA_HISTOGRAM_TIMES("OfflinePages.Model.ConstructionToLoadedEventTime",
637 base::TimeTicks::Now() - start_time); 639 base::TimeTicks::Now() - start_time);
638 640
639 // Create Storage Manager. 641 // Create Storage Manager.
640 storage_manager_.reset( 642 storage_manager_.reset(
641 new OfflinePageStorageManager(this, GetPolicyController())); 643 new OfflinePageStorageManager(this, GetPolicyController(), prefs_));
642 644
643 // Run all the delayed tasks. 645 // Run all the delayed tasks.
644 for (const auto& delayed_task : delayed_tasks_) 646 for (const auto& delayed_task : delayed_tasks_)
645 delayed_task.Run(); 647 delayed_task.Run();
646 delayed_tasks_.clear(); 648 delayed_tasks_.clear();
647 649
648 FOR_EACH_OBSERVER(Observer, observers_, OfflinePageModelLoaded(this)); 650 FOR_EACH_OBSERVER(Observer, observers_, OfflinePageModelLoaded(this));
649 651
650 CheckForExternalFileDeletion(); 652 CheckForExternalFileDeletion();
651 } 653 }
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after
834 void OfflinePageModel::RunWhenLoaded(const base::Closure& task) { 836 void OfflinePageModel::RunWhenLoaded(const base::Closure& task) {
835 if (!is_loaded_) { 837 if (!is_loaded_) {
836 delayed_tasks_.push_back(task); 838 delayed_tasks_.push_back(task);
837 return; 839 return;
838 } 840 }
839 841
840 base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, task); 842 base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, task);
841 } 843 }
842 844
843 } // namespace offline_pages 845 } // namespace offline_pages
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698