| 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/chrome_content_browser_client.h" | 5 #include "chrome/browser/chrome_content_browser_client.h" |
| 6 | 6 |
| 7 #include <map> | 7 #include <map> |
| 8 #include <set> | 8 #include <set> |
| 9 #include <utility> | 9 #include <utility> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 2768 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2779 ChromeBrowsingDataRemoverDelegate::DATA_TYPE_PLUGIN_DATA, | 2779 ChromeBrowsingDataRemoverDelegate::DATA_TYPE_PLUGIN_DATA, |
| 2780 ChromeBrowsingDataRemoverDelegate::ALL_ORIGIN_TYPES, | 2780 ChromeBrowsingDataRemoverDelegate::ALL_ORIGIN_TYPES, |
| 2781 std::move(domain_filter_builder), observer); | 2781 std::move(domain_filter_builder), observer); |
| 2782 } else { | 2782 } else { |
| 2783 // The first removal task is a no-op. | 2783 // The first removal task is a no-op. |
| 2784 observer->OnBrowsingDataRemoverDone(); | 2784 observer->OnBrowsingDataRemoverDone(); |
| 2785 } | 2785 } |
| 2786 | 2786 |
| 2787 // Delete origin-scoped data. | 2787 // Delete origin-scoped data. |
| 2788 int remove_mask = 0; | 2788 int remove_mask = 0; |
| 2789 if (remove_storage) { | 2789 if (remove_storage) |
| 2790 remove_mask |= ChromeBrowsingDataRemoverDelegate::DATA_TYPE_SITE_DATA & | 2790 remove_mask |= BrowsingDataRemover::DATA_TYPE_DOM_STORAGE; |
| 2791 ~BrowsingDataRemover::DATA_TYPE_COOKIES & | |
| 2792 ~BrowsingDataRemover::DATA_TYPE_CHANNEL_IDS & | |
| 2793 ~ChromeBrowsingDataRemoverDelegate::DATA_TYPE_PLUGIN_DATA; | |
| 2794 } | |
| 2795 if (remove_cache) | 2791 if (remove_cache) |
| 2796 remove_mask |= BrowsingDataRemover::DATA_TYPE_CACHE; | 2792 remove_mask |= BrowsingDataRemover::DATA_TYPE_CACHE; |
| 2797 | 2793 |
| 2798 if (remove_mask) { | 2794 if (remove_mask) { |
| 2799 std::unique_ptr<BrowsingDataFilterBuilder> origin_filter_builder( | 2795 std::unique_ptr<BrowsingDataFilterBuilder> origin_filter_builder( |
| 2800 BrowsingDataFilterBuilder::Create( | 2796 BrowsingDataFilterBuilder::Create( |
| 2801 BrowsingDataFilterBuilder::WHITELIST)); | 2797 BrowsingDataFilterBuilder::WHITELIST)); |
| 2802 origin_filter_builder->AddOrigin(origin); | 2798 origin_filter_builder->AddOrigin(origin); |
| 2803 | 2799 |
| 2804 remover->RemoveWithFilterAndReply( | 2800 remover->RemoveWithFilterAndReply( |
| (...skipping 749 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3554 RedirectNonUINonIOBrowserThreadsToTaskScheduler() { | 3550 RedirectNonUINonIOBrowserThreadsToTaskScheduler() { |
| 3555 return variations::GetVariationParamValue( | 3551 return variations::GetVariationParamValue( |
| 3556 "BrowserScheduler", "RedirectNonUINonIOBrowserThreads") == "true"; | 3552 "BrowserScheduler", "RedirectNonUINonIOBrowserThreads") == "true"; |
| 3557 } | 3553 } |
| 3558 | 3554 |
| 3559 // static | 3555 // static |
| 3560 void ChromeContentBrowserClient::SetDefaultQuotaSettingsForTesting( | 3556 void ChromeContentBrowserClient::SetDefaultQuotaSettingsForTesting( |
| 3561 const storage::QuotaSettings* settings) { | 3557 const storage::QuotaSettings* settings) { |
| 3562 g_default_quota_settings = settings; | 3558 g_default_quota_settings = settings; |
| 3563 } | 3559 } |
| OLD | NEW |