chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.cc - Issue 2479593006: Move enable extensions define to a build flag.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.cc

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

« no previous file with comments | « chrome/browser/renderer_host/chrome_render_message_filter.cc ('k') | chrome/browser/safe_browsing/incident_reporting/extension_data_collection.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.cc

diff --git a/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.cc b/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.cc

index 09d7c0b9d610b0f8ed437cd7d5cdd7253f336ba9..30a58414fec4754ea74acdca134de572245d3669 100644

--- a/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.cc

+++ b/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) {