chrome/app/nacl_fork_delegate_linux.cc - Issue 17198013: Don't use PathService for the location of nacl_helper and nacl_helper_bootstrap

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/app/nacl_fork_delegate_linux.cc

Issue 17198013: Don't use PathService for the location of nacl_helper and nacl_helper_bootstrap (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Bring nacl_paths back Created 7 years, 6 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:

View side-by-side diff with in-line comments

Download patch

Index: chrome/app/nacl_fork_delegate_linux.cc

diff --git a/chrome/app/nacl_fork_delegate_linux.cc b/chrome/app/nacl_fork_delegate_linux.cc

index c16603daeeb3e4e86d2de3ec6e87ea6273c6a816..58afac05d7f360449c7ce916876538393ab5c1dc 100644

--- a/chrome/app/nacl_fork_delegate_linux.cc

+++ b/chrome/app/nacl_fork_delegate_linux.cc

@@ -23,6 +23,7 @@

#include "chrome/common/chrome_paths.h"

#include "chrome/common/chrome_switches.h"

#include "chrome/common/nacl_helper_linux.h"

+#include "chrome/common/nacl_paths.h"

NaClForkDelegate::NaClForkDelegate()

: status_(kNaClHelperUnused),

@@ -50,9 +51,9 @@ void NaClForkDelegate::Init(const int sandboxdesc) {

status_ = kNaClHelperUnused;

base::FilePath helper_exe;

base::FilePath helper_bootstrap_exe;

- if (!PathService::Get(chrome::FILE_NACL_HELPER, &helper_exe)) {

+ if (!PathService::Get(nacl::FILE_NACL_HELPER, &helper_exe)) {

status_ = kNaClHelperMissing;

- } else if (!PathService::Get(chrome::FILE_NACL_HELPER_BOOTSTRAP,

+ } else if (!PathService::Get(nacl::FILE_NACL_HELPER_BOOTSTRAP,

&helper_bootstrap_exe)) {

status_ = kNaClHelperBootstrapMissing;

} else if (RunningOnValgrind()) {

« no previous file with comments | « chrome/app/chrome_main_delegate.cc ('k') | chrome/common/chrome_paths.h » ('j') | no next file with comments »