OLD | NEW |
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 "chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.
h" | 5 #include "chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.
h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include "base/macros.h" | 9 #include "base/macros.h" |
10 #include "base/memory/ptr_util.h" | 10 #include "base/memory/ptr_util.h" |
11 #include "base/metrics/histogram_macros.h" | 11 #include "base/metrics/histogram_macros.h" |
12 #include "base/metrics/sparse_histogram.h" | 12 #include "base/metrics/sparse_histogram.h" |
13 #include "chrome/browser/browsing_data/browsing_data_counter_factory.h" | 13 #include "chrome/browser/browsing_data/browsing_data_counter_factory.h" |
14 #include "chrome/browser/browsing_data/browsing_data_counter_utils.h" | 14 #include "chrome/browser/browsing_data/browsing_data_counter_utils.h" |
15 #include "chrome/browser/browsing_data/browsing_data_helper.h" | 15 #include "chrome/browser/browsing_data/browsing_data_helper.h" |
16 #include "chrome/browser/browsing_data/browsing_data_remover_factory.h" | 16 #include "chrome/browser/browsing_data/browsing_data_remover_factory.h" |
| 17 #include "chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.h" |
17 #include "chrome/browser/history/web_history_service_factory.h" | 18 #include "chrome/browser/history/web_history_service_factory.h" |
18 #include "chrome/browser/sync/profile_sync_service_factory.h" | 19 #include "chrome/browser/sync/profile_sync_service_factory.h" |
19 #include "chrome/common/channel_info.h" | 20 #include "chrome/common/channel_info.h" |
20 #include "chrome/common/pref_names.h" | 21 #include "chrome/common/pref_names.h" |
21 #include "components/browsing_data/core/history_notice_utils.h" | 22 #include "components/browsing_data/core/history_notice_utils.h" |
22 #include "components/browsing_data/core/pref_names.h" | 23 #include "components/browsing_data/core/pref_names.h" |
23 #include "components/prefs/pref_service.h" | 24 #include "components/prefs/pref_service.h" |
24 #include "content/public/browser/web_ui.h" | 25 #include "content/public/browser/web_ui.h" |
25 | 26 |
26 namespace { | 27 namespace { |
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
115 task_observer_.reset(); | 116 task_observer_.reset(); |
116 counters_.clear(); | 117 counters_.clear(); |
117 } | 118 } |
118 | 119 |
119 void ClearBrowsingDataHandler::HandleClearBrowsingData( | 120 void ClearBrowsingDataHandler::HandleClearBrowsingData( |
120 const base::ListValue* args) { | 121 const base::ListValue* args) { |
121 DCHECK(!task_observer_); | 122 DCHECK(!task_observer_); |
122 | 123 |
123 PrefService* prefs = profile_->GetPrefs(); | 124 PrefService* prefs = profile_->GetPrefs(); |
124 | 125 |
125 int site_data_mask = BrowsingDataRemover::REMOVE_SITE_DATA; | 126 int site_data_mask = ChromeBrowsingDataRemoverDelegate::DATA_TYPE_SITE_DATA; |
126 // Don't try to clear LSO data if it's not supported. | 127 // Don't try to clear LSO data if it's not supported. |
127 if (!prefs->GetBoolean(prefs::kClearPluginLSODataEnabled)) | 128 if (!prefs->GetBoolean(prefs::kClearPluginLSODataEnabled)) |
128 site_data_mask &= ~BrowsingDataRemover::REMOVE_PLUGIN_DATA; | 129 site_data_mask &= ~ChromeBrowsingDataRemoverDelegate::DATA_TYPE_PLUGIN_DATA; |
129 | 130 |
130 int remove_mask = 0; | 131 int remove_mask = 0; |
131 if (prefs->GetBoolean(prefs::kAllowDeletingBrowserHistory)) { | 132 if (prefs->GetBoolean(prefs::kAllowDeletingBrowserHistory)) { |
132 if (prefs->GetBoolean(browsing_data::prefs::kDeleteBrowsingHistory)) | 133 if (prefs->GetBoolean(browsing_data::prefs::kDeleteBrowsingHistory)) |
133 remove_mask |= BrowsingDataRemover::REMOVE_HISTORY; | 134 remove_mask |= ChromeBrowsingDataRemoverDelegate::DATA_TYPE_HISTORY; |
134 if (prefs->GetBoolean(browsing_data::prefs::kDeleteDownloadHistory)) | 135 if (prefs->GetBoolean(browsing_data::prefs::kDeleteDownloadHistory)) |
135 remove_mask |= BrowsingDataRemover::REMOVE_DOWNLOADS; | 136 remove_mask |= BrowsingDataRemover::DATA_TYPE_DOWNLOADS; |
136 } | 137 } |
137 | 138 |
138 if (prefs->GetBoolean(browsing_data::prefs::kDeleteCache)) | 139 if (prefs->GetBoolean(browsing_data::prefs::kDeleteCache)) |
139 remove_mask |= BrowsingDataRemover::REMOVE_CACHE; | 140 remove_mask |= BrowsingDataRemover::DATA_TYPE_CACHE; |
140 | 141 |
141 int origin_mask = 0; | 142 int origin_mask = 0; |
142 if (prefs->GetBoolean(browsing_data::prefs::kDeleteCookies)) { | 143 if (prefs->GetBoolean(browsing_data::prefs::kDeleteCookies)) { |
143 remove_mask |= site_data_mask; | 144 remove_mask |= site_data_mask; |
144 origin_mask |= BrowsingDataHelper::UNPROTECTED_WEB; | 145 origin_mask |= BrowsingDataRemover::ORIGIN_TYPE_UNPROTECTED_WEB; |
145 } | 146 } |
146 | 147 |
147 if (prefs->GetBoolean(browsing_data::prefs::kDeletePasswords)) | 148 if (prefs->GetBoolean(browsing_data::prefs::kDeletePasswords)) |
148 remove_mask |= BrowsingDataRemover::REMOVE_PASSWORDS; | 149 remove_mask |= ChromeBrowsingDataRemoverDelegate::DATA_TYPE_PASSWORDS; |
149 | 150 |
150 if (prefs->GetBoolean(browsing_data::prefs::kDeleteFormData)) | 151 if (prefs->GetBoolean(browsing_data::prefs::kDeleteFormData)) |
151 remove_mask |= BrowsingDataRemover::REMOVE_FORM_DATA; | 152 remove_mask |= ChromeBrowsingDataRemoverDelegate::DATA_TYPE_FORM_DATA; |
152 | 153 |
153 if (prefs->GetBoolean(browsing_data::prefs::kDeleteMediaLicenses)) | 154 if (prefs->GetBoolean(browsing_data::prefs::kDeleteMediaLicenses)) |
154 remove_mask |= BrowsingDataRemover::REMOVE_MEDIA_LICENSES; | 155 remove_mask |= BrowsingDataRemover::DATA_TYPE_MEDIA_LICENSES; |
155 | 156 |
156 if (prefs->GetBoolean(browsing_data::prefs::kDeleteHostedAppsData)) { | 157 if (prefs->GetBoolean(browsing_data::prefs::kDeleteHostedAppsData)) { |
157 remove_mask |= site_data_mask; | 158 remove_mask |= site_data_mask; |
158 origin_mask |= BrowsingDataHelper::PROTECTED_WEB; | 159 origin_mask |= BrowsingDataRemover::ORIGIN_TYPE_PROTECTED_WEB; |
159 } | 160 } |
160 | 161 |
161 // Record the deletion of cookies and cache. | 162 // Record the deletion of cookies and cache. |
162 BrowsingDataRemover::CookieOrCacheDeletionChoice choice = | 163 BrowsingDataRemover::CookieOrCacheDeletionChoice choice = |
163 BrowsingDataRemover::NEITHER_COOKIES_NOR_CACHE; | 164 BrowsingDataRemover::NEITHER_COOKIES_NOR_CACHE; |
164 if (prefs->GetBoolean(browsing_data::prefs::kDeleteCookies)) { | 165 if (prefs->GetBoolean(browsing_data::prefs::kDeleteCookies)) { |
165 choice = prefs->GetBoolean(browsing_data::prefs::kDeleteCache) | 166 choice = prefs->GetBoolean(browsing_data::prefs::kDeleteCache) |
166 ? BrowsingDataRemover::BOTH_COOKIES_AND_CACHE | 167 ? BrowsingDataRemover::BOTH_COOKIES_AND_CACHE |
167 : BrowsingDataRemover::ONLY_COOKIES; | 168 : BrowsingDataRemover::ONLY_COOKIES; |
168 } else if (prefs->GetBoolean(browsing_data::prefs::kDeleteCache)) { | 169 } else if (prefs->GetBoolean(browsing_data::prefs::kDeleteCache)) { |
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
325 | 326 |
326 void ClearBrowsingDataHandler::UpdateCounterText( | 327 void ClearBrowsingDataHandler::UpdateCounterText( |
327 std::unique_ptr<browsing_data::BrowsingDataCounter::Result> result) { | 328 std::unique_ptr<browsing_data::BrowsingDataCounter::Result> result) { |
328 CallJavascriptFunction( | 329 CallJavascriptFunction( |
329 "cr.webUIListenerCallback", base::Value("update-counter-text"), | 330 "cr.webUIListenerCallback", base::Value("update-counter-text"), |
330 base::Value(result->source()->GetPrefName()), | 331 base::Value(result->source()->GetPrefName()), |
331 base::Value(GetChromeCounterTextFromResult(result.get()))); | 332 base::Value(GetChromeCounterTextFromResult(result.get()))); |
332 } | 333 } |
333 | 334 |
334 } // namespace settings | 335 } // namespace settings |
OLD | NEW |