| Index: chrome/renderer/content_settings_observer.h
|
| diff --git a/chrome/renderer/content_settings_observer.h b/chrome/renderer/content_settings_observer.h
|
| index 6da3a2962e9384c11f4e89889a03a3f32f1dadca..0d284d9af13aab4fe596f873c838f7b9e3802135 100644
|
| --- a/chrome/renderer/content_settings_observer.h
|
| +++ b/chrome/renderer/content_settings_observer.h
|
| @@ -16,6 +16,7 @@
|
| #include "components/content_settings/core/common/content_settings_types.h"
|
| #include "content/public/renderer/render_frame_observer.h"
|
| #include "content/public/renderer/render_frame_observer_tracker.h"
|
| +#include "extensions/features/features.h"
|
| #include "third_party/WebKit/public/web/WebContentSettingsClient.h"
|
| #include "url/gurl.h"
|
|
|
| @@ -111,7 +112,7 @@ class ContentSettingsObserver
|
| // Whether the observed RenderFrame is for a platform app.
|
| bool IsPlatformApp();
|
|
|
| -#if defined(ENABLE_EXTENSIONS)
|
| +#if BUILDFLAG(ENABLE_EXTENSIONS)
|
| // If |origin| corresponds to an installed extension, returns that extension.
|
| // Otherwise returns NULL.
|
| const extensions::Extension* GetExtension(
|
| @@ -126,7 +127,7 @@ class ContentSettingsObserver
|
| const blink::WebSecurityOrigin& origin,
|
| const GURL& document_url);
|
|
|
| -#if defined(ENABLE_EXTENSIONS)
|
| +#if BUILDFLAG(ENABLE_EXTENSIONS)
|
| // Owned by ChromeContentRendererClient and outlive us.
|
| extensions::Dispatcher* const extension_dispatcher_;
|
| #endif
|
|
|