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

Side by Side Diff: chrome/installer/util/util_constants.cc

Issue 7863024: Make the NaCl windows 64 bit binaries not depend on chrome targets. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: simplify chrome_exe.gypi Created 9 years, 3 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/installer/util/util_constants.h ('k') | chrome/nacl.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/installer/util/util_constants.h" 5 #include "chrome/installer/util/util_constants.h"
6 6
7 namespace installer { 7 namespace installer {
8 8
9 namespace switches { 9 namespace switches {
10 10
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 157
158 } // namespace switches 158 } // namespace switches
159 159
160 const wchar_t kChromeDll[] = L"chrome.dll"; 160 const wchar_t kChromeDll[] = L"chrome.dll";
161 const wchar_t kChromeExe[] = L"chrome.exe"; 161 const wchar_t kChromeExe[] = L"chrome.exe";
162 const wchar_t kChromeFrameDll[] = L"npchrome_frame.dll"; 162 const wchar_t kChromeFrameDll[] = L"npchrome_frame.dll";
163 const wchar_t kChromeFrameHelperExe[] = L"chrome_frame_helper.exe"; 163 const wchar_t kChromeFrameHelperExe[] = L"chrome_frame_helper.exe";
164 const wchar_t kChromeFrameHelperWndClass[] = L"ChromeFrameHelperWindowClass"; 164 const wchar_t kChromeFrameHelperWndClass[] = L"ChromeFrameHelperWindowClass";
165 const wchar_t kChromeFrameReadyModeField[] = L"ChromeFrameReadyMode"; 165 const wchar_t kChromeFrameReadyModeField[] = L"ChromeFrameReadyMode";
166 const wchar_t kChromeLauncherExe[] = L"chrome_launcher.exe"; 166 const wchar_t kChromeLauncherExe[] = L"chrome_launcher.exe";
167 const wchar_t kChromeNaCl64Dll[] = L"nacl64.dll";
168 const wchar_t kChromeNewExe[] = L"new_chrome.exe"; 167 const wchar_t kChromeNewExe[] = L"new_chrome.exe";
169 const wchar_t kChromeOldExe[] = L"old_chrome.exe"; 168 const wchar_t kChromeOldExe[] = L"old_chrome.exe";
170 const wchar_t kCmdQuickEnableCf[] = L"quick-enable-cf"; 169 const wchar_t kCmdQuickEnableCf[] = L"quick-enable-cf";
171 const wchar_t kGoogleChromeInstallSubDir1[] = L"Google"; 170 const wchar_t kGoogleChromeInstallSubDir1[] = L"Google";
172 const wchar_t kGoogleChromeInstallSubDir2[] = L"Chrome"; 171 const wchar_t kGoogleChromeInstallSubDir2[] = L"Chrome";
173 const wchar_t kInstallBinaryDir[] = L"Application"; 172 const wchar_t kInstallBinaryDir[] = L"Application";
174 const wchar_t kInstallerDir[] = L"Installer"; 173 const wchar_t kInstallerDir[] = L"Installer";
175 const wchar_t kInstallTempDir[] = L"Temp"; 174 const wchar_t kInstallTempDir[] = L"Temp";
176 const wchar_t kInstallUserDataDir[] = L"User Data"; 175 const wchar_t kInstallUserDataDir[] = L"User Data";
177 const wchar_t kNaClExe[] = L"nacl64.exe"; 176 const wchar_t kNaClExe[] = L"nacl64.exe";
(...skipping 13 matching lines...) Expand all
191 190
192 // The presence of this environment variable with a value of 1 implies that 191 // The presence of this environment variable with a value of 1 implies that
193 // we should run as a system installation regardless of what is on the 192 // we should run as a system installation regardless of what is on the
194 // command line. 193 // command line.
195 const char kGoogleUpdateIsMachineEnvVar[] = "GoogleUpdateIsMachine"; 194 const char kGoogleUpdateIsMachineEnvVar[] = "GoogleUpdateIsMachine";
196 195
197 const wchar_t kOptionMultiInstall[] = L"multi-install"; 196 const wchar_t kOptionMultiInstall[] = L"multi-install";
198 const wchar_t kOptionReadyMode[] = L"ready-mode"; 197 const wchar_t kOptionReadyMode[] = L"ready-mode";
199 198
200 } // namespace installer 199 } // namespace installer
OLDNEW
« no previous file with comments | « chrome/installer/util/util_constants.h ('k') | chrome/nacl.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698