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

Unified Diff: chrome/browser/nacl_host/nacl_broker_host_win.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 | « no previous file | chrome/browser/nacl_host/nacl_browser.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/nacl_host/nacl_broker_host_win.cc
diff --git a/chrome/browser/nacl_host/nacl_broker_host_win.cc b/chrome/browser/nacl_host/nacl_broker_host_win.cc
index 2115adb573cec1d9dbb82e6b2278f61a5919f5a8..b8d2c4f0a6b817f923eca76831e98321dfe8b960 100644
--- a/chrome/browser/nacl_host/nacl_broker_host_win.cc
+++ b/chrome/browser/nacl_host/nacl_broker_host_win.cc
@@ -8,8 +8,7 @@
#include "base/path_service.h"
#include "ipc/ipc_switches.h"
#include "chrome/browser/nacl_host/nacl_broker_service_win.h"
-#include "chrome/browser/nacl_host/nacl_process_host.h"
-#include "chrome/common/chrome_constants.h"
+#include "chrome/browser/nacl_host/nacl_browser.h"
#include "chrome/common/chrome_process_type.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/logging_chrome.h"
@@ -52,11 +51,10 @@ bool NaClBrokerHost::Init() {
return false;
// Create the path to the nacl broker/loader executable.
- base::FilePath module_path;
- if (!PathService::Get(base::FILE_MODULE, &module_path))
+ base::FilePath nacl_path;
+ if (!NaClBrowser::GetInstance()->GetNaCl64ExePath(&nacl_path))
return false;
- base::FilePath nacl_path = module_path.DirName().Append(chrome::kNaClAppName);
CommandLine* cmd_line = new CommandLine(nacl_path);
nacl::CopyNaClCommandLineArguments(cmd_line);
« no previous file with comments | « no previous file | chrome/browser/nacl_host/nacl_browser.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698