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

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

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
« no previous file with comments | « build/common.gypi ('k') | chrome/browser/browsing_data/browsing_data_remover.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.h
diff --git a/chrome/browser/browsing_data/browsing_data_remover.h b/chrome/browser/browsing_data/browsing_data_remover.h
index 25b95d5b6b6243b6c7cf810499756ff3a4032ca7..b0a39bc3cc0973ff118b0d6fc7e30aa2cd5dcbfc 100644
--- a/chrome/browser/browsing_data/browsing_data_remover.h
+++ b/chrome/browser/browsing_data/browsing_data_remover.h
@@ -51,8 +51,10 @@ struct SessionStorageUsageInfo;
// visits in url database, downloads, cookies ...
class BrowsingDataRemover : public content::NotificationObserver,
- public base::WaitableEventWatcher::Delegate,
- public PepperFlashSettingsManager::Client {
+#if defined(ENABLE_PLUGINS)
+ public PepperFlashSettingsManager::Client,
+#endif
+ public base::WaitableEventWatcher::Delegate {
public:
// Time period ranges available when doing browsing data removals.
enum TimePeriod {
@@ -213,9 +215,11 @@ class BrowsingDataRemover : public content::NotificationObserver,
virtual void OnWaitableEventSignaled(
base::WaitableEvent* waitable_event) OVERRIDE;
+#if defined(ENABLE_PLUGINS)
// PepperFlashSettingsManager::Client implementation.
virtual void OnDeauthorizeContentLicensesCompleted(uint32 request_id,
bool success) OVERRIDE;
+#endif
// Removes the specified items related to browsing for a specific host. If the
// provided |origin| is empty, data is removed for all origins. The
@@ -366,10 +370,12 @@ class BrowsingDataRemover : public content::NotificationObserver,
scoped_ptr<content::PluginDataRemover> plugin_data_remover_;
base::WaitableEventWatcher watcher_;
+#if defined(ENABLE_PLUGINS)
// Used to deauthorize content licenses for Pepper Flash.
scoped_ptr<PepperFlashSettingsManager> pepper_flash_settings_manager_;
- uint32 deauthorize_content_licenses_request_id_;
+#endif
+ uint32 deauthorize_content_licenses_request_id_;
// True if we're waiting for various data to be deleted.
// These may only be accessed from UI thread in order to avoid races!
bool waiting_for_clear_cache_;
« no previous file with comments | « build/common.gypi ('k') | chrome/browser/browsing_data/browsing_data_remover.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698