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

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

Issue 11414180: Add a gyp flag to allow removing dependency on ppapi. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase 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
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 cee0b6b11b0afcc9a3665885be46b85f0e6b76d4..7d3c5dae68d040db91cc60f3644ec85dfc8ef380 100644
--- a/chrome/browser/browsing_data/browsing_data_remover.cc
+++ b/chrome/browser/browsing_data/browsing_data_remover.cc
@@ -488,6 +488,7 @@ void BrowsingDataRemover::RemoveImpl(int remove_mask,
}
}
+#if defined(ENABLE_PLUGINS)
if (remove_mask & REMOVE_CONTENT_LICENSES) {
content::RecordAction(
UserMetricsAction("ClearBrowsingData_ContentLicenses"));
@@ -500,6 +501,7 @@ void BrowsingDataRemover::RemoveImpl(int remove_mask,
deauthorize_content_licenses_request_id_ =
pepper_flash_settings_manager_->DeauthorizeContentLicenses();
}
+#endif
// Always wipe accumulated network related data (TransportSecurityState and
// HttpServerPropertiesManager data).
@@ -944,6 +946,7 @@ void BrowsingDataRemover::OnWaitableEventSignaled(
NotifyAndDeleteIfDone();
}
+#if defined(ENABLE_PLUGINS)
void BrowsingDataRemover::OnDeauthorizeContentLicensesCompleted(
uint32 request_id,
bool /* success */) {
@@ -953,6 +956,7 @@ void BrowsingDataRemover::OnDeauthorizeContentLicensesCompleted(
waiting_for_clear_content_licenses_ = false;
NotifyAndDeleteIfDone();
}
+#endif
void BrowsingDataRemover::OnClearedCookies(int num_deleted) {
if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) {
« no previous file with comments | « chrome/browser/browsing_data/browsing_data_remover.h ('k') | chrome/browser/chrome_content_browser_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698