Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(155)

Unified Diff: chrome/browser/nacl_host/nacl_process_host.cc

Issue 16154005: Remove dependency from NaCl code on chrome_constants. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Move the new method to NaClBrowser 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
« no previous file with comments | « chrome/browser/nacl_host/nacl_browser.cc ('k') | chrome/common/chrome_constants.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/nacl_host/nacl_process_host.cc
diff --git a/chrome/browser/nacl_host/nacl_process_host.cc b/chrome/browser/nacl_host/nacl_process_host.cc
index 6f7f50cb2f0b8e3eb08de4acbaf92ffdfb5d65ec..05cec372fb5b7273e8f745d7b41898b59f86d8e6 100644
--- a/chrome/browser/nacl_host/nacl_process_host.cc
+++ b/chrome/browser/nacl_host/nacl_process_host.cc
@@ -27,7 +27,6 @@
#include "chrome/browser/nacl_host/nacl_browser.h"
#include "chrome/browser/nacl_host/nacl_host_message_filter.h"
#include "chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.h"
-#include "chrome/common/chrome_constants.h"
#include "chrome/common/chrome_paths.h"
#include "chrome/common/chrome_process_type.h"
#include "chrome/common/chrome_switches.h"
@@ -443,12 +442,9 @@ bool NaClProcessHost::LaunchSelLdr() {
#if defined(OS_WIN)
// On Windows 64-bit NaCl loader is called nacl64.exe instead of chrome.exe
if (RunningOnWOW64()) {
- base::FilePath module_path;
- if (!PathService::Get(base::FILE_MODULE, &module_path)) {
- LOG(ERROR) << "NaCl process launch failed: could not resolve module";
+ if (!NaClBrowser::GetInstance()->GetNaCl64ExePath(&exe_path)) {
return false;
}
- exe_path = module_path.DirName().Append(chrome::kNaClAppName);
}
#endif
« no previous file with comments | « chrome/browser/nacl_host/nacl_browser.cc ('k') | chrome/common/chrome_constants.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698