diff options
Diffstat (limited to 'chromium/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.cc')
-rw-r--r-- | chromium/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.cc | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/chromium/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.cc b/chromium/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.cc index 09d7c0b9d61..30a58414fec 100644 --- a/chromium/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.cc +++ b/chromium/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.cc @@ -16,12 +16,7 @@ #include "content/public/browser/browser_thread.h" #include "content/public/browser/child_process_security_policy.h" #include "content/public/browser/render_view_host.h" -#if defined(ENABLE_EXTENSIONS) -#include "extensions/browser/extension_registry.h" -#include "extensions/common/constants.h" -#include "extensions/common/extension.h" -#include "extensions/common/extension_set.h" -#endif +#include "extensions/features/features.h" #include "ppapi/c/pp_errors.h" #include "ppapi/host/dispatch_host_message.h" #include "ppapi/host/host_message_context.h" @@ -30,6 +25,13 @@ #include "ppapi/shared_impl/file_system_util.h" #include "storage/browser/fileapi/isolated_context.h" +#if BUILDFLAG(ENABLE_EXTENSIONS) +#include "extensions/browser/extension_registry.h" +#include "extensions/common/constants.h" +#include "extensions/common/extension.h" +#include "extensions/common/extension_set.h" +#endif + namespace chrome { namespace { @@ -102,7 +104,7 @@ Profile* PepperIsolatedFileSystemMessageFilter::GetProfile() { std::string PepperIsolatedFileSystemMessageFilter::CreateCrxFileSystem( Profile* profile) { -#if defined(ENABLE_EXTENSIONS) +#if BUILDFLAG(ENABLE_EXTENSIONS) const extensions::Extension* extension = extensions::ExtensionRegistry::Get(profile)->enabled_extensions().GetByID( document_url_.host()); @@ -140,7 +142,7 @@ int32_t PepperIsolatedFileSystemMessageFilter::OnOpenFileSystem( int32_t PepperIsolatedFileSystemMessageFilter::OpenCrxFileSystem( ppapi::host::HostMessageContext* context) { -#if defined(ENABLE_EXTENSIONS) +#if BUILDFLAG(ENABLE_EXTENSIONS) Profile* profile = GetProfile(); const extensions::ExtensionSet* extension_set = NULL; if (profile) { |