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 #include "chrome/browser/ui/webui/options/clear_browser_data_handler.h" | 5 #include "chrome/browser/ui/webui/options/clear_browser_data_handler.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include <memory> | 9 #include <memory> |
10 #include <utility> | 10 #include <utility> |
11 | 11 |
12 #include "base/bind.h" | 12 #include "base/bind.h" |
13 #include "base/bind_helpers.h" | 13 #include "base/bind_helpers.h" |
14 #include "base/macros.h" | 14 #include "base/macros.h" |
15 #include "base/memory/ptr_util.h" | 15 #include "base/memory/ptr_util.h" |
16 #include "base/metrics/histogram_macros.h" | 16 #include "base/metrics/histogram_macros.h" |
17 #include "base/metrics/sparse_histogram.h" | 17 #include "base/metrics/sparse_histogram.h" |
18 #include "base/strings/string16.h" | 18 #include "base/strings/string16.h" |
19 #include "base/strings/string_number_conversions.h" | 19 #include "base/strings/string_number_conversions.h" |
20 #include "base/strings/utf_string_conversions.h" | 20 #include "base/strings/utf_string_conversions.h" |
21 #include "base/values.h" | 21 #include "base/values.h" |
22 #include "chrome/app/chrome_command_ids.h" | 22 #include "chrome/app/chrome_command_ids.h" |
23 #include "chrome/browser/browser_process.h" | 23 #include "chrome/browser/browser_process.h" |
24 #include "chrome/browser/browsing_data/browsing_data_counter_factory.h" | 24 #include "chrome/browser/browsing_data/browsing_data_counter_factory.h" |
25 #include "chrome/browser/browsing_data/browsing_data_counter_utils.h" | 25 #include "chrome/browser/browsing_data/browsing_data_counter_utils.h" |
26 #include "chrome/browser/browsing_data/browsing_data_helper.h" | 26 #include "chrome/browser/browsing_data/browsing_data_helper.h" |
27 #include "chrome/browser/browsing_data/browsing_data_remover.h" | 27 #include "chrome/browser/browsing_data/browsing_data_remover.h" |
28 #include "chrome/browser/browsing_data/browsing_data_remover_factory.h" | 28 #include "chrome/browser/browsing_data/browsing_data_remover_factory.h" |
| 29 #include "chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.h" |
29 #include "chrome/browser/history/web_history_service_factory.h" | 30 #include "chrome/browser/history/web_history_service_factory.h" |
30 #include "chrome/browser/prefs/incognito_mode_prefs.h" | 31 #include "chrome/browser/prefs/incognito_mode_prefs.h" |
31 #include "chrome/browser/profiles/profile.h" | 32 #include "chrome/browser/profiles/profile.h" |
32 #include "chrome/browser/sync/profile_sync_service_factory.h" | 33 #include "chrome/browser/sync/profile_sync_service_factory.h" |
33 #include "chrome/browser/ui/accelerator_utils.h" | 34 #include "chrome/browser/ui/accelerator_utils.h" |
34 #include "chrome/common/channel_info.h" | 35 #include "chrome/common/channel_info.h" |
35 #include "chrome/common/pref_names.h" | 36 #include "chrome/common/pref_names.h" |
36 #include "chrome/grit/generated_resources.h" | 37 #include "chrome/grit/generated_resources.h" |
37 #include "chrome/grit/locale_settings.h" | 38 #include "chrome/grit/locale_settings.h" |
38 #include "components/browsing_data/core/counters/browsing_data_counter.h" | 39 #include "components/browsing_data/core/counters/browsing_data_counter.h" |
(...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
239 } | 240 } |
240 | 241 |
241 void ClearBrowserDataHandler::HandleClearBrowserData( | 242 void ClearBrowserDataHandler::HandleClearBrowserData( |
242 const base::ListValue* value) { | 243 const base::ListValue* value) { |
243 // We should never be called when the previous clearing has not yet finished. | 244 // We should never be called when the previous clearing has not yet finished. |
244 CHECK(!remover_); | 245 CHECK(!remover_); |
245 | 246 |
246 Profile* profile = Profile::FromWebUI(web_ui()); | 247 Profile* profile = Profile::FromWebUI(web_ui()); |
247 PrefService* prefs = profile->GetPrefs(); | 248 PrefService* prefs = profile->GetPrefs(); |
248 | 249 |
249 int site_data_mask = BrowsingDataRemover::REMOVE_SITE_DATA; | 250 int site_data_mask = ChromeBrowsingDataRemoverDelegate::DATA_TYPE_SITE_DATA; |
250 // Don't try to clear LSO data if it's not supported. | 251 // Don't try to clear LSO data if it's not supported. |
251 if (!*clear_plugin_lso_data_enabled_) | 252 if (!*clear_plugin_lso_data_enabled_) |
252 site_data_mask &= ~BrowsingDataRemover::REMOVE_PLUGIN_DATA; | 253 site_data_mask &= ~ChromeBrowsingDataRemoverDelegate::DATA_TYPE_PLUGIN_DATA; |
253 | 254 |
254 int remove_mask = 0; | 255 int remove_mask = 0; |
255 int origin_mask = 0; | 256 int origin_mask = 0; |
256 if (prefs->GetBoolean(browsing_data::prefs::kDeleteBrowsingHistory) && | 257 if (prefs->GetBoolean(browsing_data::prefs::kDeleteBrowsingHistory) && |
257 *allow_deleting_browser_history_) { | 258 *allow_deleting_browser_history_) { |
258 remove_mask |= BrowsingDataRemover::REMOVE_HISTORY; | 259 remove_mask |= ChromeBrowsingDataRemoverDelegate::DATA_TYPE_HISTORY; |
259 } | 260 } |
260 if (prefs->GetBoolean(browsing_data::prefs::kDeleteDownloadHistory) && | 261 if (prefs->GetBoolean(browsing_data::prefs::kDeleteDownloadHistory) && |
261 *allow_deleting_browser_history_) { | 262 *allow_deleting_browser_history_) { |
262 remove_mask |= BrowsingDataRemover::REMOVE_DOWNLOADS; | 263 remove_mask |= BrowsingDataRemover::DATA_TYPE_DOWNLOADS; |
263 } | 264 } |
264 if (prefs->GetBoolean(browsing_data::prefs::kDeleteCache)) | 265 if (prefs->GetBoolean(browsing_data::prefs::kDeleteCache)) |
265 remove_mask |= BrowsingDataRemover::REMOVE_CACHE; | 266 remove_mask |= BrowsingDataRemover::DATA_TYPE_CACHE; |
266 if (prefs->GetBoolean(browsing_data::prefs::kDeleteCookies)) { | 267 if (prefs->GetBoolean(browsing_data::prefs::kDeleteCookies)) { |
267 remove_mask |= site_data_mask; | 268 remove_mask |= site_data_mask; |
268 origin_mask |= BrowsingDataHelper::UNPROTECTED_WEB; | 269 origin_mask |= BrowsingDataRemover::ORIGIN_TYPE_UNPROTECTED_WEB; |
269 } | 270 } |
270 if (prefs->GetBoolean(browsing_data::prefs::kDeletePasswords)) | 271 if (prefs->GetBoolean(browsing_data::prefs::kDeletePasswords)) |
271 remove_mask |= BrowsingDataRemover::REMOVE_PASSWORDS; | 272 remove_mask |= ChromeBrowsingDataRemoverDelegate::DATA_TYPE_PASSWORDS; |
272 if (prefs->GetBoolean(browsing_data::prefs::kDeleteFormData)) | 273 if (prefs->GetBoolean(browsing_data::prefs::kDeleteFormData)) |
273 remove_mask |= BrowsingDataRemover::REMOVE_FORM_DATA; | 274 remove_mask |= ChromeBrowsingDataRemoverDelegate::DATA_TYPE_FORM_DATA; |
274 if (prefs->GetBoolean(browsing_data::prefs::kDeleteMediaLicenses)) | 275 if (prefs->GetBoolean(browsing_data::prefs::kDeleteMediaLicenses)) |
275 remove_mask |= BrowsingDataRemover::REMOVE_MEDIA_LICENSES; | 276 remove_mask |= BrowsingDataRemover::DATA_TYPE_MEDIA_LICENSES; |
276 if (prefs->GetBoolean(browsing_data::prefs::kDeleteHostedAppsData)) { | 277 if (prefs->GetBoolean(browsing_data::prefs::kDeleteHostedAppsData)) { |
277 remove_mask |= site_data_mask; | 278 remove_mask |= site_data_mask; |
278 origin_mask |= BrowsingDataHelper::PROTECTED_WEB; | 279 origin_mask |= BrowsingDataRemover::ORIGIN_TYPE_PROTECTED_WEB; |
279 } | 280 } |
280 | 281 |
281 // Record the deletion of cookies and cache. | 282 // Record the deletion of cookies and cache. |
282 BrowsingDataRemover::CookieOrCacheDeletionChoice choice = | 283 BrowsingDataRemover::CookieOrCacheDeletionChoice choice = |
283 BrowsingDataRemover::NEITHER_COOKIES_NOR_CACHE; | 284 BrowsingDataRemover::NEITHER_COOKIES_NOR_CACHE; |
284 if (prefs->GetBoolean(browsing_data::prefs::kDeleteCookies)) { | 285 if (prefs->GetBoolean(browsing_data::prefs::kDeleteCookies)) { |
285 choice = prefs->GetBoolean(browsing_data::prefs::kDeleteCache) | 286 choice = prefs->GetBoolean(browsing_data::prefs::kDeleteCache) |
286 ? BrowsingDataRemover::BOTH_COOKIES_AND_CACHE | 287 ? BrowsingDataRemover::BOTH_COOKIES_AND_CACHE |
287 : BrowsingDataRemover::ONLY_COOKIES; | 288 : BrowsingDataRemover::ONLY_COOKIES; |
288 } else if (prefs->GetBoolean(browsing_data::prefs::kDeleteCache)) { | 289 } else if (prefs->GetBoolean(browsing_data::prefs::kDeleteCache)) { |
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
432 "History.ClearBrowsingData.HistoryNoticeShownInFooterWhenUpdated", | 433 "History.ClearBrowsingData.HistoryNoticeShownInFooterWhenUpdated", |
433 should_show_history_notice_); | 434 should_show_history_notice_); |
434 } | 435 } |
435 | 436 |
436 void ClearBrowserDataHandler::UpdateHistoryDeletionDialog(bool show) { | 437 void ClearBrowserDataHandler::UpdateHistoryDeletionDialog(bool show) { |
437 // This is used by OnBrowsingDataRemoverDone (when the deletion finishes). | 438 // This is used by OnBrowsingDataRemoverDone (when the deletion finishes). |
438 should_show_history_deletion_dialog_ = show; | 439 should_show_history_deletion_dialog_ = show; |
439 } | 440 } |
440 | 441 |
441 } // namespace options | 442 } // namespace options |
OLD | NEW |