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

Unified Diff: chrome/browser/renderer_host/chrome_navigation_ui_data.h

Issue 2479593006: Move enable extensions define to a build flag. (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/renderer_host/chrome_navigation_ui_data.h
diff --git a/chrome/browser/renderer_host/chrome_navigation_ui_data.h b/chrome/browser/renderer_host/chrome_navigation_ui_data.h
index 4f441e03d44b5bad4dd9de7362ced0fec9a6a27c..2a9d8cb6853a38847be56501d22726a36a7e298a 100644
--- a/chrome/browser/renderer_host/chrome_navigation_ui_data.h
+++ b/chrome/browser/renderer_host/chrome_navigation_ui_data.h
@@ -10,6 +10,7 @@
#include "base/macros.h"
#include "content/public/browser/navigation_ui_data.h"
#include "extensions/browser/extension_navigation_ui_data.h"
+#include "extensions/features/features.h"
namespace content {
class NavigationHandle;
@@ -31,7 +32,7 @@ class ChromeNavigationUIData : public content::NavigationUIData {
// reflected in the clone. |extension_data_| is deep copied.
std::unique_ptr<content::NavigationUIData> Clone() const override;
-#if defined(ENABLE_EXTENSIONS)
+#if BUILDFLAG(ENABLE_EXTENSIONS)
void SetExtensionNavigationUIData(
std::unique_ptr<extensions::ExtensionNavigationUIData> extension_data);
@@ -41,7 +42,7 @@ class ChromeNavigationUIData : public content::NavigationUIData {
#endif
private:
-#if defined(ENABLE_EXTENSIONS)
+#if BUILDFLAG(ENABLE_EXTENSIONS)
// Manages the lifetime of optional ExtensionNavigationUIData information.
std::unique_ptr<extensions::ExtensionNavigationUIData> extension_data_;
#endif

Powered by Google App Engine
This is Rietveld 408576698