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

Unified Diff: chrome/browser/plugins/plugin_observer.h

Issue 2405013002: Move some global feature defines to buildflags (Closed)
Patch Set: Comment Created 4 years, 2 months 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/plugins/plugin_infobar_delegates.cc ('k') | chrome/browser/plugins/plugin_observer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/plugins/plugin_observer.h
diff --git a/chrome/browser/plugins/plugin_observer.h b/chrome/browser/plugins/plugin_observer.h
index aa90cba314f5922e09ad5f0736f7636082f567e3..2273fd1546cba779ab2e5129e5f6cfcb5a6403be 100644
--- a/chrome/browser/plugins/plugin_observer.h
+++ b/chrome/browser/plugins/plugin_observer.h
@@ -10,11 +10,12 @@
#include "base/macros.h"
#include "base/memory/weak_ptr.h"
+#include "chrome/common/features.h"
#include "components/component_updater/component_updater_service.h"
#include "content/public/browser/web_contents_observer.h"
#include "content/public/browser/web_contents_user_data.h"
-#if defined(ENABLE_PLUGIN_INSTALLATION)
+#if BUILDFLAG(ENABLE_PLUGIN_INSTALLATION)
#include <map>
#endif
@@ -22,7 +23,7 @@ class GURL;
class PluginFinder;
class PluginMetadata;
-#if defined(ENABLE_PLUGIN_INSTALLATION)
+#if BUILDFLAG(ENABLE_PLUGIN_INSTALLATION)
class PluginInstaller;
class PluginPlaceholderHost;
#endif
@@ -60,7 +61,7 @@ class PluginObserver : public content::WebContentsObserver,
const std::string& identifier);
void OnBlockedComponentUpdatedPlugin(int placeholder_id,
const std::string& identifier);
-#if defined(ENABLE_PLUGIN_INSTALLATION)
+#if BUILDFLAG(ENABLE_PLUGIN_INSTALLATION)
void OnRemovePluginPlaceholderHost(int placeholder_id);
#endif
void RemoveComponentObserver(int placeholder_id);
@@ -68,7 +69,7 @@ class PluginObserver : public content::WebContentsObserver,
void OnShowFlashPermissionBubble();
void OnCouldNotLoadPlugin(const base::FilePath& plugin_path);
-#if defined(ENABLE_PLUGIN_INSTALLATION)
+#if BUILDFLAG(ENABLE_PLUGIN_INSTALLATION)
// Stores all PluginPlaceholderHosts, keyed by their routing ID.
std::map<int, PluginPlaceholderHost*> plugin_placeholders_;
#endif
« no previous file with comments | « chrome/browser/plugins/plugin_infobar_delegates.cc ('k') | chrome/browser/plugins/plugin_observer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698