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

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

Issue 11475007: Exclude content/plugin/ when plugins are disabled. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years 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
« no previous file with comments | « chrome/browser/browsing_data/browsing_data_remover.h ('k') | content/browser/plugin_data_remover_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 7d3c5dae68d040db91cc60f3644ec85dfc8ef380..f21e2ae3f459f5e39411c60e1ab5e854be5a287c 100644
--- a/chrome/browser/browsing_data/browsing_data_remover.cc
+++ b/chrome/browser/browsing_data/browsing_data_remover.cc
@@ -406,6 +406,7 @@ void BrowsingDataRemover::RemoveImpl(int remove_mask,
base::Unretained(this)));
}
+#if defined(ENABLE_PLUGINS)
// Plugin is data not separated for protected and unprotected web origins. We
// check the origin_set_mask_ to prevent unintended deletion.
if (remove_mask & REMOVE_PLUGIN_DATA &&
@@ -419,6 +420,7 @@ void BrowsingDataRemover::RemoveImpl(int remove_mask,
plugin_data_remover_->StartRemoving(delete_begin_);
watcher_.StartWatching(event, this);
}
+#endif
if (remove_mask & REMOVE_PASSWORDS) {
content::RecordAction(UserMetricsAction("ClearBrowsingData_Passwords"));
« no previous file with comments | « chrome/browser/browsing_data/browsing_data_remover.h ('k') | content/browser/plugin_data_remover_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698