summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoramit@chromium.org <amit@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-21 21:15:53 +0000
committeramit@chromium.org <amit@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-21 21:15:53 +0000
commit7b1bf816970d76ef2a062f3bd1e235e7e584746b (patch)
tree3cc41ecea933d9dbc7dc5961def2c356a1d3c195
parent26aaec01fc9c98a3866683621cc06ad744de0a16 (diff)
downloadchromium_src-7b1bf816970d76ef2a062f3bd1e235e7e584746b.zip
chromium_src-7b1bf816970d76ef2a062f3bd1e235e7e584746b.tar.gz
chromium_src-7b1bf816970d76ef2a062f3bd1e235e7e584746b.tar.bz2
Fix nacl build
Review URL: http://codereview.chromium.org/2833023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50389 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/app/client_util.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/chrome/app/client_util.cc b/chrome/app/client_util.cc
index 4730e53..5a59049 100644
--- a/chrome/app/client_util.cc
+++ b/chrome/app/client_util.cc
@@ -90,8 +90,8 @@ bool IsRunningHeadless() {
// value not being null to dermine if this path contains a valid dll.
HMODULE LoadChromeWithDirectory(std::wstring* dir) {
::SetCurrentDirectoryW(dir->c_str());
-#ifdef _WIN64
const CommandLine& cmd_line = *CommandLine::ForCurrentProcess();
+#ifdef _WIN64
if ((cmd_line.GetSwitchValueASCII(switches::kProcessType) ==
switches::kNaClBrokerProcess) ||
(cmd_line.GetSwitchValueASCII(switches::kProcessType) ==
@@ -111,7 +111,6 @@ HMODULE LoadChromeWithDirectory(std::wstring* dir) {
// The idea is to pre read significant portion of chrome.dll in advance
// so that subsequent hard page faults are avoided.
DWORD pre_read_size_mb = 0;
- const CommandLine& cmd_line = *CommandLine::ForCurrentProcess();
if (!cmd_line.HasSwitch(switches::kProcessType) &&
(IsRunningHeadless() || InstallUtil::IsChromeFrameProcess())) {
HKEY key = NULL;