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

Unified Diff: chrome/browser/browsing_data/browsing_data_remover.cc

Issue 2512563003: Convert enable_plugins to a buildflag header. (Closed)
Patch Set: Merge Created 4 years, 1 month 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/browsing_data/browsing_data_remover.cc
diff --git a/chrome/browser/browsing_data/browsing_data_remover.cc b/chrome/browser/browsing_data/browsing_data_remover.cc
index 8fe00d5e7f6000aaef5c6d674260df2696d302d3..806c873df368c201dc6eb8667279856c78f70635 100644
--- a/chrome/browser/browsing_data/browsing_data_remover.cc
+++ b/chrome/browser/browsing_data/browsing_data_remover.cc
@@ -89,6 +89,7 @@
#include "net/ssl/channel_id_store.h"
#include "net/url_request/url_request_context.h"
#include "net/url_request/url_request_context_getter.h"
+#include "ppapi/features/features.h"
#include "storage/browser/quota/special_storage_policy.h"
#include "url/origin.h"
@@ -106,7 +107,7 @@
#include "extensions/browser/extension_prefs.h"
#endif
-#if defined(ENABLE_PLUGINS)
+#if BUILDFLAG(ENABLE_PLUGINS)
#include "chrome/browser/browsing_data/browsing_data_flash_lso_helper.h"
#endif
@@ -323,7 +324,7 @@ BrowsingDataRemover::BrowsingDataRemover(
remove_mask_(-1),
origin_type_mask_(-1),
is_removing_(false),
-#if defined(ENABLE_PLUGINS)
+#if BUILDFLAG(ENABLE_PLUGINS)
flash_lso_helper_(BrowsingDataFlashLSOHelper::Create(profile_)),
#endif
#if BUILDFLAG(ANDROID_JAVA_UI)
@@ -850,7 +851,7 @@ void BrowsingDataRemover::RemoveImpl(
content::StoragePartition::REMOVE_DATA_MASK_FILE_SYSTEMS;
}
-#if defined(ENABLE_PLUGINS)
+#if BUILDFLAG(ENABLE_PLUGINS)
// Plugin is data not separated for protected and unprotected web origins. We
// check the origin_type_mask_ to prevent unintended deletion.
if (remove_mask & REMOVE_PLUGIN_DATA &&
@@ -1116,7 +1117,7 @@ void BrowsingDataRemover::RemoveImpl(
content::RecordAction(
UserMetricsAction("ClearBrowsingData_ContentLicenses"));
-#if defined(ENABLE_PLUGINS)
+#if BUILDFLAG(ENABLE_PLUGINS)
waiting_for_clear_flash_content_licenses_ = true;
if (!pepper_flash_settings_manager_.get()) {
pepper_flash_settings_manager_.reset(
@@ -1142,7 +1143,7 @@ void BrowsingDataRemover::RemoveImpl(
waiting_for_clear_platform_keys_ = true;
}
#endif // defined(OS_CHROMEOS)
-#endif // defined(ENABLE_PLUGINS)
+#endif // BUILDFLAG(ENABLE_PLUGINS)
}
// Remove omnibox zero-suggest cache results. Filtering is not supported.
@@ -1226,7 +1227,7 @@ void BrowsingDataRemover::OverrideWebappRegistryForTesting(
}
#endif
-#if defined(ENABLE_PLUGINS)
+#if BUILDFLAG(ENABLE_PLUGINS)
void BrowsingDataRemover::OverrideFlashLSOHelperForTesting(
scoped_refptr<BrowsingDataFlashLSOHelper> flash_lso_helper) {
flash_lso_helper_ = flash_lso_helper;
@@ -1409,7 +1410,7 @@ void BrowsingDataRemover::ClearedPnaclCache() {
}
#endif
-#if defined(ENABLE_PLUGINS)
+#if BUILDFLAG(ENABLE_PLUGINS)
void BrowsingDataRemover::OnWaitableEventSignaled(
base::WaitableEvent* waitable_event) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
« no previous file with comments | « chrome/browser/browsing_data/browsing_data_remover.h ('k') | chrome/browser/browsing_data/browsing_data_remover_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698