chrome/browser/nacl_host/nacl_browser_delegate_impl.h - Issue 831813004: Get nacl building again 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.h

Issue 831813004: Get nacl building again for android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Remove process launcher change Created 5 years, 11 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.h

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

index 5907b3f067b3093d991a76eb016268398a53c762..4ffc170d27aec5d2458ab4a5e1d77374d4f528fb 100644

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

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

@@ -10,7 +10,9 @@

#include "base/compiler_specific.h"

#include "components/nacl/browser/nacl_browser_delegate.h"

Lei Zhang 2015/01/21 21:32:22 nit: blank line to separate the #if from the above

sehr 2015/01/22 19:57:22 Done.

+#if defined(ENABLE_EXTENSIONS)

#include "extensions/common/url_pattern.h"

+#endif

namespace extensions {

bbudge 2015/01/21 21:22:07 It seems strange that this isn't in the above #ifd

sehr 2015/01/22 19:57:22 Merged into the ifdef.

class InfoMap;

@@ -51,7 +53,9 @@ class NaClBrowserDelegateImpl : public NaClBrowserDelegate {

#endif

ProfileManager* profile_manager_;

+#if defined(ENABLE_EXTENSIONS)

std::vector<URLPattern> debug_patterns_;

+#endif

bool inverse_debug_patterns_;

std::set<std::string> allowed_nonsfi_origins_;

DISALLOW_COPY_AND_ASSIGN(NaClBrowserDelegateImpl);