chrome/browser/nacl_host/nacl_browser_delegate_impl.cc - Issue 671573002: Fix disable_nacl=0 build for Android

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/nacl_host/nacl_browser_delegate_impl.cc

Issue 671573002: Fix disable_nacl=0 build for Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Disable all extension-related header file inclusions unless ENABLE_EXTENSIONS Created 6 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:

Index: chrome/browser/nacl_host/nacl_browser_delegate_impl.cc

diff --git a/chrome/browser/nacl_host/nacl_browser_delegate_impl.cc b/chrome/browser/nacl_host/nacl_browser_delegate_impl.cc

index 1217e2a1f14937c15ceb0bb057843c33edbf4f42..e1c5498b5bbbcbc416a8081b6f77f32388a7021b 100644

--- a/chrome/browser/nacl_host/nacl_browser_delegate_impl.cc

+++ b/chrome/browser/nacl_host/nacl_browser_delegate_impl.cc

@@ -8,7 +8,9 @@

#include "base/strings/string_split.h"

#include "chrome/browser/browser_process.h"

#include "chrome/browser/component_updater/pnacl/pnacl_component_installer.h"

+#if defined(ENABLE_EXTENSIONS)

#include "chrome/browser/extensions/extension_service.h"

+#endif

#include "chrome/browser/nacl_host/nacl_infobar_delegate.h"

#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/profiles/profile_manager.h"

@@ -19,12 +21,14 @@

#include "chrome/common/logging_chrome.h"

#include "chrome/common/pepper_permission_util.h"

#include "content/public/browser/browser_thread.h"

+#if defined(ENABLE_EXTENSIONS)

#include "extensions/browser/extension_system.h"

#include "extensions/browser/info_map.h"

#include "extensions/browser/process_manager.h"

#include "extensions/common/constants.h"

#include "extensions/common/extension.h"

#include "extensions/common/url_pattern.h"

+#endif

#include "ppapi/c/private/ppb_nacl_private.h"

#include "url/gurl.h"

« no previous file with comments | « no previous file | chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.cc » ('j') | no next file with comments »