OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 #ifndef CHROME_BROWSER_BROWSING_DATA_COOKIES_TREE_MODEL_H_ | 5 #ifndef CHROME_BROWSER_BROWSING_DATA_COOKIES_TREE_MODEL_H_ |
6 #define CHROME_BROWSER_BROWSING_DATA_COOKIES_TREE_MODEL_H_ | 6 #define CHROME_BROWSER_BROWSING_DATA_COOKIES_TREE_MODEL_H_ |
7 | 7 |
8 // TODO(viettrungluu): This header file #includes far too much and has too much | 8 // TODO(viettrungluu): This header file #includes far too much and has too much |
9 // inline code (which shouldn't be inline). | 9 // inline code (which shouldn't be inline). |
10 | 10 |
11 #include <list> | 11 #include <list> |
12 #include <string> | 12 #include <string> |
13 #include <vector> | 13 #include <vector> |
14 | 14 |
15 #include "base/memory/ref_counted.h" | 15 #include "base/memory/ref_counted.h" |
16 #include "base/memory/weak_ptr.h" | 16 #include "base/memory/weak_ptr.h" |
17 #include "base/observer_list.h" | 17 #include "base/observer_list.h" |
18 #include "base/strings/string16.h" | 18 #include "base/strings/string16.h" |
19 #include "base/strings/utf_string_conversions.h" | 19 #include "base/strings/utf_string_conversions.h" |
20 #include "chrome/browser/browsing_data/browsing_data_appcache_helper.h" | 20 #include "chrome/browser/browsing_data/browsing_data_appcache_helper.h" |
| 21 #include "chrome/browser/browsing_data/browsing_data_cache_storage_helper.h" |
21 #include "chrome/browser/browsing_data/browsing_data_database_helper.h" | 22 #include "chrome/browser/browsing_data/browsing_data_database_helper.h" |
22 #include "chrome/browser/browsing_data/browsing_data_file_system_helper.h" | 23 #include "chrome/browser/browsing_data/browsing_data_file_system_helper.h" |
23 #include "chrome/browser/browsing_data/browsing_data_indexed_db_helper.h" | 24 #include "chrome/browser/browsing_data/browsing_data_indexed_db_helper.h" |
24 #include "chrome/browser/browsing_data/browsing_data_local_storage_helper.h" | 25 #include "chrome/browser/browsing_data/browsing_data_local_storage_helper.h" |
25 #include "chrome/browser/browsing_data/browsing_data_quota_helper.h" | 26 #include "chrome/browser/browsing_data/browsing_data_quota_helper.h" |
26 #include "chrome/browser/browsing_data/browsing_data_service_worker_helper.h" | 27 #include "chrome/browser/browsing_data/browsing_data_service_worker_helper.h" |
27 #include "chrome/browser/browsing_data/local_data_container.h" | 28 #include "chrome/browser/browsing_data/local_data_container.h" |
28 #include "components/content_settings/core/common/content_settings.h" | 29 #include "components/content_settings/core/common/content_settings.h" |
29 #include "net/ssl/channel_id_store.h" | 30 #include "net/ssl/channel_id_store.h" |
30 #include "ui/base/models/tree_node_model.h" | 31 #include "ui/base/models/tree_node_model.h" |
31 | 32 |
32 class BrowsingDataChannelIDHelper; | 33 class BrowsingDataChannelIDHelper; |
33 class BrowsingDataCookieHelper; | 34 class BrowsingDataCookieHelper; |
34 class CookiesTreeModel; | 35 class CookiesTreeModel; |
35 class CookieTreeAppCacheNode; | 36 class CookieTreeAppCacheNode; |
36 class CookieTreeAppCachesNode; | 37 class CookieTreeAppCachesNode; |
| 38 class CookieTreeCacheStorageNode; |
| 39 class CookieTreeCacheStoragesNode; |
37 class CookieTreeChannelIDNode; | 40 class CookieTreeChannelIDNode; |
38 class CookieTreeChannelIDsNode; | 41 class CookieTreeChannelIDsNode; |
39 class CookieTreeCookieNode; | 42 class CookieTreeCookieNode; |
40 class CookieTreeCookiesNode; | 43 class CookieTreeCookiesNode; |
41 class CookieTreeDatabaseNode; | 44 class CookieTreeDatabaseNode; |
42 class CookieTreeDatabasesNode; | 45 class CookieTreeDatabasesNode; |
43 class CookieTreeFileSystemNode; | 46 class CookieTreeFileSystemNode; |
44 class CookieTreeFileSystemsNode; | 47 class CookieTreeFileSystemsNode; |
45 class CookieTreeFlashLSONode; | 48 class CookieTreeFlashLSONode; |
46 class CookieTreeHostNode; | 49 class CookieTreeHostNode; |
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
94 TYPE_APPCACHE, // This is used for CookieTreeAppCacheNode. | 97 TYPE_APPCACHE, // This is used for CookieTreeAppCacheNode. |
95 TYPE_INDEXED_DBS, // This is used for CookieTreeIndexedDBsNode. | 98 TYPE_INDEXED_DBS, // This is used for CookieTreeIndexedDBsNode. |
96 TYPE_INDEXED_DB, // This is used for CookieTreeIndexedDBNode. | 99 TYPE_INDEXED_DB, // This is used for CookieTreeIndexedDBNode. |
97 TYPE_FILE_SYSTEMS, // This is used for CookieTreeFileSystemsNode. | 100 TYPE_FILE_SYSTEMS, // This is used for CookieTreeFileSystemsNode. |
98 TYPE_FILE_SYSTEM, // This is used for CookieTreeFileSystemNode. | 101 TYPE_FILE_SYSTEM, // This is used for CookieTreeFileSystemNode. |
99 TYPE_QUOTA, // This is used for CookieTreeQuotaNode. | 102 TYPE_QUOTA, // This is used for CookieTreeQuotaNode. |
100 TYPE_CHANNEL_IDS, // Used for CookieTreeChannelIDsNode. | 103 TYPE_CHANNEL_IDS, // Used for CookieTreeChannelIDsNode. |
101 TYPE_CHANNEL_ID, // Used for CookieTreeChannelIDNode. | 104 TYPE_CHANNEL_ID, // Used for CookieTreeChannelIDNode. |
102 TYPE_SERVICE_WORKERS, // This is used for CookieTreeServiceWorkersNode. | 105 TYPE_SERVICE_WORKERS, // This is used for CookieTreeServiceWorkersNode. |
103 TYPE_SERVICE_WORKER, // This is used for CookieTreeServiceWorkerNode. | 106 TYPE_SERVICE_WORKER, // This is used for CookieTreeServiceWorkerNode. |
| 107 TYPE_CACHE_STORAGES, // This is used for CookieTreeCacheStoragesNode. |
| 108 TYPE_CACHE_STORAGE, // This is used for CookieTreeCacheStorageNode. |
104 TYPE_FLASH_LSO, // This is used for CookieTreeFlashLSONode. | 109 TYPE_FLASH_LSO, // This is used for CookieTreeFlashLSONode. |
105 }; | 110 }; |
106 | 111 |
107 DetailedInfo(); | 112 DetailedInfo(); |
108 ~DetailedInfo(); | 113 ~DetailedInfo(); |
109 | 114 |
110 DetailedInfo& Init(NodeType type); | 115 DetailedInfo& Init(NodeType type); |
111 DetailedInfo& InitHost(); | 116 DetailedInfo& InitHost(); |
112 DetailedInfo& InitCookie(const net::CanonicalCookie* cookie); | 117 DetailedInfo& InitCookie(const net::CanonicalCookie* cookie); |
113 DetailedInfo& InitDatabase( | 118 DetailedInfo& InitDatabase( |
114 const BrowsingDataDatabaseHelper::DatabaseInfo* database_info); | 119 const BrowsingDataDatabaseHelper::DatabaseInfo* database_info); |
115 DetailedInfo& InitLocalStorage( | 120 DetailedInfo& InitLocalStorage( |
116 const BrowsingDataLocalStorageHelper::LocalStorageInfo* | 121 const BrowsingDataLocalStorageHelper::LocalStorageInfo* |
117 local_storage_info); | 122 local_storage_info); |
118 DetailedInfo& InitSessionStorage( | 123 DetailedInfo& InitSessionStorage( |
119 const BrowsingDataLocalStorageHelper::LocalStorageInfo* | 124 const BrowsingDataLocalStorageHelper::LocalStorageInfo* |
120 session_storage_info); | 125 session_storage_info); |
121 DetailedInfo& InitAppCache(const GURL& origin, | 126 DetailedInfo& InitAppCache(const GURL& origin, |
122 const content::AppCacheInfo* appcache_info); | 127 const content::AppCacheInfo* appcache_info); |
123 DetailedInfo& InitIndexedDB( | 128 DetailedInfo& InitIndexedDB( |
124 const content::IndexedDBInfo* indexed_db_info); | 129 const content::IndexedDBInfo* indexed_db_info); |
125 DetailedInfo& InitFileSystem( | 130 DetailedInfo& InitFileSystem( |
126 const BrowsingDataFileSystemHelper::FileSystemInfo* file_system_info); | 131 const BrowsingDataFileSystemHelper::FileSystemInfo* file_system_info); |
127 DetailedInfo& InitQuota( | 132 DetailedInfo& InitQuota( |
128 const BrowsingDataQuotaHelper::QuotaInfo* quota_info); | 133 const BrowsingDataQuotaHelper::QuotaInfo* quota_info); |
129 DetailedInfo& InitChannelID( | 134 DetailedInfo& InitChannelID( |
130 const net::ChannelIDStore::ChannelID* channel_id); | 135 const net::ChannelIDStore::ChannelID* channel_id); |
131 DetailedInfo& InitServiceWorker( | 136 DetailedInfo& InitServiceWorker( |
132 const content::ServiceWorkerUsageInfo* service_worker_info); | 137 const content::ServiceWorkerUsageInfo* service_worker_info); |
| 138 DetailedInfo& InitCacheStorage( |
| 139 const content::CacheStorageUsageInfo* cache_storage_info); |
133 DetailedInfo& InitFlashLSO(const std::string& flash_lso_domain); | 140 DetailedInfo& InitFlashLSO(const std::string& flash_lso_domain); |
134 | 141 |
135 NodeType node_type; | 142 NodeType node_type; |
136 GURL origin; | 143 GURL origin; |
137 const net::CanonicalCookie* cookie = nullptr; | 144 const net::CanonicalCookie* cookie = nullptr; |
138 const BrowsingDataDatabaseHelper::DatabaseInfo* database_info = nullptr; | 145 const BrowsingDataDatabaseHelper::DatabaseInfo* database_info = nullptr; |
139 const BrowsingDataLocalStorageHelper::LocalStorageInfo* local_storage_info = | 146 const BrowsingDataLocalStorageHelper::LocalStorageInfo* local_storage_info = |
140 nullptr; | 147 nullptr; |
141 const BrowsingDataLocalStorageHelper::LocalStorageInfo* | 148 const BrowsingDataLocalStorageHelper::LocalStorageInfo* |
142 session_storage_info = nullptr; | 149 session_storage_info = nullptr; |
143 const content::AppCacheInfo* appcache_info = nullptr; | 150 const content::AppCacheInfo* appcache_info = nullptr; |
144 const content::IndexedDBInfo* indexed_db_info = nullptr; | 151 const content::IndexedDBInfo* indexed_db_info = nullptr; |
145 const BrowsingDataFileSystemHelper::FileSystemInfo* file_system_info = | 152 const BrowsingDataFileSystemHelper::FileSystemInfo* file_system_info = |
146 nullptr; | 153 nullptr; |
147 const BrowsingDataQuotaHelper::QuotaInfo* quota_info = nullptr; | 154 const BrowsingDataQuotaHelper::QuotaInfo* quota_info = nullptr; |
148 const net::ChannelIDStore::ChannelID* channel_id = nullptr; | 155 const net::ChannelIDStore::ChannelID* channel_id = nullptr; |
149 const content::ServiceWorkerUsageInfo* service_worker_info = nullptr; | 156 const content::ServiceWorkerUsageInfo* service_worker_info = nullptr; |
| 157 const content::CacheStorageUsageInfo* cache_storage_info = nullptr; |
150 std::string flash_lso_domain; | 158 std::string flash_lso_domain; |
151 }; | 159 }; |
152 | 160 |
153 CookieTreeNode() {} | 161 CookieTreeNode() {} |
154 explicit CookieTreeNode(const base::string16& title) | 162 explicit CookieTreeNode(const base::string16& title) |
155 : ui::TreeNode<CookieTreeNode>(title) {} | 163 : ui::TreeNode<CookieTreeNode>(title) {} |
156 ~CookieTreeNode() override {} | 164 ~CookieTreeNode() override {} |
157 | 165 |
158 // Delete backend storage for this node, and any children nodes. (E.g. delete | 166 // Delete backend storage for this node, and any children nodes. (E.g. delete |
159 // the cookie from CookieMonster, clear the database, and so forth.) | 167 // the cookie from CookieMonster, clear the database, and so forth.) |
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
207 // CookieTreeHostNode methods: | 215 // CookieTreeHostNode methods: |
208 CookieTreeCookiesNode* GetOrCreateCookiesNode(); | 216 CookieTreeCookiesNode* GetOrCreateCookiesNode(); |
209 CookieTreeDatabasesNode* GetOrCreateDatabasesNode(); | 217 CookieTreeDatabasesNode* GetOrCreateDatabasesNode(); |
210 CookieTreeLocalStoragesNode* GetOrCreateLocalStoragesNode(); | 218 CookieTreeLocalStoragesNode* GetOrCreateLocalStoragesNode(); |
211 CookieTreeSessionStoragesNode* GetOrCreateSessionStoragesNode(); | 219 CookieTreeSessionStoragesNode* GetOrCreateSessionStoragesNode(); |
212 CookieTreeAppCachesNode* GetOrCreateAppCachesNode(); | 220 CookieTreeAppCachesNode* GetOrCreateAppCachesNode(); |
213 CookieTreeIndexedDBsNode* GetOrCreateIndexedDBsNode(); | 221 CookieTreeIndexedDBsNode* GetOrCreateIndexedDBsNode(); |
214 CookieTreeFileSystemsNode* GetOrCreateFileSystemsNode(); | 222 CookieTreeFileSystemsNode* GetOrCreateFileSystemsNode(); |
215 CookieTreeChannelIDsNode* GetOrCreateChannelIDsNode(); | 223 CookieTreeChannelIDsNode* GetOrCreateChannelIDsNode(); |
216 CookieTreeServiceWorkersNode* GetOrCreateServiceWorkersNode(); | 224 CookieTreeServiceWorkersNode* GetOrCreateServiceWorkersNode(); |
| 225 CookieTreeCacheStoragesNode* GetOrCreateCacheStoragesNode(); |
217 CookieTreeQuotaNode* UpdateOrCreateQuotaNode( | 226 CookieTreeQuotaNode* UpdateOrCreateQuotaNode( |
218 std::list<BrowsingDataQuotaHelper::QuotaInfo>::iterator quota_info); | 227 std::list<BrowsingDataQuotaHelper::QuotaInfo>::iterator quota_info); |
219 CookieTreeFlashLSONode* GetOrCreateFlashLSONode(const std::string& domain); | 228 CookieTreeFlashLSONode* GetOrCreateFlashLSONode(const std::string& domain); |
220 | 229 |
221 std::string canonicalized_host() const { return canonicalized_host_; } | 230 std::string canonicalized_host() const { return canonicalized_host_; } |
222 | 231 |
223 // Creates an content exception for this origin of type | 232 // Creates an content exception for this origin of type |
224 // CONTENT_SETTINGS_TYPE_COOKIES. | 233 // CONTENT_SETTINGS_TYPE_COOKIES. |
225 void CreateContentException(content_settings::CookieSettings* cookie_settings, | 234 void CreateContentException(content_settings::CookieSettings* cookie_settings, |
226 ContentSetting setting) const; | 235 ContentSetting setting) const; |
(...skipping 12 matching lines...) Expand all Loading... |
239 CookieTreeCookiesNode* cookies_child_ = nullptr; | 248 CookieTreeCookiesNode* cookies_child_ = nullptr; |
240 CookieTreeDatabasesNode* databases_child_ = nullptr; | 249 CookieTreeDatabasesNode* databases_child_ = nullptr; |
241 CookieTreeLocalStoragesNode* local_storages_child_ = nullptr; | 250 CookieTreeLocalStoragesNode* local_storages_child_ = nullptr; |
242 CookieTreeSessionStoragesNode* session_storages_child_ = nullptr; | 251 CookieTreeSessionStoragesNode* session_storages_child_ = nullptr; |
243 CookieTreeAppCachesNode* appcaches_child_ = nullptr; | 252 CookieTreeAppCachesNode* appcaches_child_ = nullptr; |
244 CookieTreeIndexedDBsNode* indexed_dbs_child_ = nullptr; | 253 CookieTreeIndexedDBsNode* indexed_dbs_child_ = nullptr; |
245 CookieTreeFileSystemsNode* file_systems_child_ = nullptr; | 254 CookieTreeFileSystemsNode* file_systems_child_ = nullptr; |
246 CookieTreeQuotaNode* quota_child_ = nullptr; | 255 CookieTreeQuotaNode* quota_child_ = nullptr; |
247 CookieTreeChannelIDsNode* channel_ids_child_ = nullptr; | 256 CookieTreeChannelIDsNode* channel_ids_child_ = nullptr; |
248 CookieTreeServiceWorkersNode* service_workers_child_ = nullptr; | 257 CookieTreeServiceWorkersNode* service_workers_child_ = nullptr; |
| 258 CookieTreeCacheStoragesNode* cache_storages_child_ = nullptr; |
249 CookieTreeFlashLSONode* flash_lso_child_ = nullptr; | 259 CookieTreeFlashLSONode* flash_lso_child_ = nullptr; |
250 | 260 |
251 // The URL for which this node was initially created. | 261 // The URL for which this node was initially created. |
252 GURL url_; | 262 GURL url_; |
253 | 263 |
254 std::string canonicalized_host_; | 264 std::string canonicalized_host_; |
255 | 265 |
256 DISALLOW_COPY_AND_ASSIGN(CookieTreeHostNode); | 266 DISALLOW_COPY_AND_ASSIGN(CookieTreeHostNode); |
257 }; | 267 }; |
258 | 268 |
(...skipping 351 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
610 DetailedInfo GetDetailedInfo() const override; | 620 DetailedInfo GetDetailedInfo() const override; |
611 | 621 |
612 void AddServiceWorkerNode(CookieTreeServiceWorkerNode* child) { | 622 void AddServiceWorkerNode(CookieTreeServiceWorkerNode* child) { |
613 AddChildSortedByTitle(child); | 623 AddChildSortedByTitle(child); |
614 } | 624 } |
615 | 625 |
616 private: | 626 private: |
617 DISALLOW_COPY_AND_ASSIGN(CookieTreeServiceWorkersNode); | 627 DISALLOW_COPY_AND_ASSIGN(CookieTreeServiceWorkersNode); |
618 }; | 628 }; |
619 | 629 |
| 630 // CookieTreeCacheStorageNode ----------------------------------------------- |
| 631 class CookieTreeCacheStorageNode : public CookieTreeNode { |
| 632 public: |
| 633 // cache_storage_info should remain valid at least as long as the |
| 634 // CookieTreeCacheStorageNode is valid. |
| 635 explicit CookieTreeCacheStorageNode( |
| 636 std::list<content::CacheStorageUsageInfo>::iterator cache_storage_info); |
| 637 ~CookieTreeCacheStorageNode() override; |
| 638 |
| 639 // CookieTreeNode methods: |
| 640 void DeleteStoredObjects() override; |
| 641 DetailedInfo GetDetailedInfo() const override; |
| 642 |
| 643 private: |
| 644 // cache_storage_info_ is expected to remain valid as long as the |
| 645 // CookieTreeCacheStorageNode is valid. |
| 646 std::list<content::CacheStorageUsageInfo>::iterator cache_storage_info_; |
| 647 |
| 648 DISALLOW_COPY_AND_ASSIGN(CookieTreeCacheStorageNode); |
| 649 }; |
| 650 |
| 651 class CookieTreeCacheStoragesNode : public CookieTreeNode { |
| 652 public: |
| 653 CookieTreeCacheStoragesNode(); |
| 654 ~CookieTreeCacheStoragesNode() override; |
| 655 |
| 656 DetailedInfo GetDetailedInfo() const override; |
| 657 |
| 658 void AddCacheStorageNode(CookieTreeCacheStorageNode* child) { |
| 659 AddChildSortedByTitle(child); |
| 660 } |
| 661 |
| 662 private: |
| 663 DISALLOW_COPY_AND_ASSIGN(CookieTreeCacheStoragesNode); |
| 664 }; |
| 665 |
620 // CookieTreeFlashLSONode ---------------------------------------------------- | 666 // CookieTreeFlashLSONode ---------------------------------------------------- |
621 class CookieTreeFlashLSONode : public CookieTreeNode { | 667 class CookieTreeFlashLSONode : public CookieTreeNode { |
622 public: | 668 public: |
623 explicit CookieTreeFlashLSONode(const std::string& domain); | 669 explicit CookieTreeFlashLSONode(const std::string& domain); |
624 ~CookieTreeFlashLSONode() override; | 670 ~CookieTreeFlashLSONode() override; |
625 | 671 |
626 // CookieTreeNode methods: | 672 // CookieTreeNode methods: |
627 void DeleteStoredObjects() override; | 673 void DeleteStoredObjects() override; |
628 DetailedInfo GetDetailedInfo() const override; | 674 DetailedInfo GetDetailedInfo() const override; |
629 | 675 |
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
714 void PopulateAppCacheInfo(LocalDataContainer* container); | 760 void PopulateAppCacheInfo(LocalDataContainer* container); |
715 void PopulateCookieInfo(LocalDataContainer* container); | 761 void PopulateCookieInfo(LocalDataContainer* container); |
716 void PopulateDatabaseInfo(LocalDataContainer* container); | 762 void PopulateDatabaseInfo(LocalDataContainer* container); |
717 void PopulateLocalStorageInfo(LocalDataContainer* container); | 763 void PopulateLocalStorageInfo(LocalDataContainer* container); |
718 void PopulateSessionStorageInfo(LocalDataContainer* container); | 764 void PopulateSessionStorageInfo(LocalDataContainer* container); |
719 void PopulateIndexedDBInfo(LocalDataContainer* container); | 765 void PopulateIndexedDBInfo(LocalDataContainer* container); |
720 void PopulateFileSystemInfo(LocalDataContainer* container); | 766 void PopulateFileSystemInfo(LocalDataContainer* container); |
721 void PopulateQuotaInfo(LocalDataContainer* container); | 767 void PopulateQuotaInfo(LocalDataContainer* container); |
722 void PopulateChannelIDInfo(LocalDataContainer* container); | 768 void PopulateChannelIDInfo(LocalDataContainer* container); |
723 void PopulateServiceWorkerUsageInfo(LocalDataContainer* container); | 769 void PopulateServiceWorkerUsageInfo(LocalDataContainer* container); |
| 770 void PopulateCacheStorageUsageInfo(LocalDataContainer* container); |
724 void PopulateFlashLSOInfo(LocalDataContainer* container); | 771 void PopulateFlashLSOInfo(LocalDataContainer* container); |
725 | 772 |
726 BrowsingDataCookieHelper* GetCookieHelper(const std::string& app_id); | 773 BrowsingDataCookieHelper* GetCookieHelper(const std::string& app_id); |
727 LocalDataContainer* data_container() { | 774 LocalDataContainer* data_container() { |
728 return data_container_.get(); | 775 return data_container_.get(); |
729 } | 776 } |
730 | 777 |
731 // Set the number of |batches_expected| this class should expect to receive. | 778 // Set the number of |batches_expected| this class should expect to receive. |
732 // If |reset| is true, then this is a new set of batches, but if false, then | 779 // If |reset| is true, then this is a new set of batches, but if false, then |
733 // this is a revised number (batches originally counted should no longer be | 780 // this is a revised number (batches originally counted should no longer be |
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
784 ScopedBatchUpdateNotifier* notifier, | 831 ScopedBatchUpdateNotifier* notifier, |
785 const base::string16& filter); | 832 const base::string16& filter); |
786 void PopulateChannelIDInfoWithFilter( | 833 void PopulateChannelIDInfoWithFilter( |
787 LocalDataContainer* container, | 834 LocalDataContainer* container, |
788 ScopedBatchUpdateNotifier* notifier, | 835 ScopedBatchUpdateNotifier* notifier, |
789 const base::string16& filter); | 836 const base::string16& filter); |
790 void PopulateServiceWorkerUsageInfoWithFilter( | 837 void PopulateServiceWorkerUsageInfoWithFilter( |
791 LocalDataContainer* container, | 838 LocalDataContainer* container, |
792 ScopedBatchUpdateNotifier* notifier, | 839 ScopedBatchUpdateNotifier* notifier, |
793 const base::string16& filter); | 840 const base::string16& filter); |
| 841 void PopulateCacheStorageUsageInfoWithFilter( |
| 842 LocalDataContainer* container, |
| 843 ScopedBatchUpdateNotifier* notifier, |
| 844 const base::string16& filter); |
794 void PopulateFlashLSOInfoWithFilter(LocalDataContainer* container, | 845 void PopulateFlashLSOInfoWithFilter(LocalDataContainer* container, |
795 ScopedBatchUpdateNotifier* notifier, | 846 ScopedBatchUpdateNotifier* notifier, |
796 const base::string16& filter); | 847 const base::string16& filter); |
797 | 848 |
798 // Map of app ids to LocalDataContainer objects to use when retrieving | 849 // Map of app ids to LocalDataContainer objects to use when retrieving |
799 // locally stored data. | 850 // locally stored data. |
800 scoped_ptr<LocalDataContainer> data_container_; | 851 scoped_ptr<LocalDataContainer> data_container_; |
801 | 852 |
802 #if defined(ENABLE_EXTENSIONS) | 853 #if defined(ENABLE_EXTENSIONS) |
803 // The extension special storage policy; see ExtensionsProtectingNode() above. | 854 // The extension special storage policy; see ExtensionsProtectingNode() above. |
(...skipping 17 matching lines...) Expand all Loading... |
821 | 872 |
822 // Counts how many batches have started already. If this is non-zero and lower | 873 // Counts how many batches have started already. If this is non-zero and lower |
823 // than batches_ended_, then this model is still batching updates. | 874 // than batches_ended_, then this model is still batching updates. |
824 int batches_started_ = 0; | 875 int batches_started_ = 0; |
825 | 876 |
826 // Counts how many batches have finished. | 877 // Counts how many batches have finished. |
827 int batches_ended_ = 0; | 878 int batches_ended_ = 0; |
828 }; | 879 }; |
829 | 880 |
830 #endif // CHROME_BROWSER_BROWSING_DATA_COOKIES_TREE_MODEL_H_ | 881 #endif // CHROME_BROWSER_BROWSING_DATA_COOKIES_TREE_MODEL_H_ |
OLD | NEW |