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

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

Issue 165382: Merge 22284 - Refactoring of master preferences parsing before adding a new p... (Closed) Base URL: svn://chrome-svn/chrome/branches/195/src/
Patch Set: Created 11 years, 4 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/master_preferences.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Property Changes:
Added: svn:mergeinfo
Merged /trunk/src/chrome/installer/util/util_constants.h:r22284
Merged /branches/chrome_webkit_merge_branch/chrome/installer/util/util_constants.h:r69-2775
OLDNEW
1 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2009 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 // Defines all install related constants that need to be used by Chrome as 5 // Defines all install related constants that need to be used by Chrome as
6 // well as Chrome Installer. 6 // well as Chrome Installer.
7 7
8 #ifndef CHROME_INSTALLER_UTIL_UTIL_CONSTANTS_H__ 8 #ifndef CHROME_INSTALLER_UTIL_UTIL_CONSTANTS_H__
9 #define CHROME_INSTALLER_UTIL_UTIL_CONSTANTS_H__ 9 #define CHROME_INSTALLER_UTIL_UTIL_CONSTANTS_H__
10 10
(...skipping 24 matching lines...) Expand all
35 UNINSTALL_CANCELLED, // User cancelled Chrome uninstallation 35 UNINSTALL_CANCELLED, // User cancelled Chrome uninstallation
36 UNKNOWN_STATUS, // Unknown status (this should never happen) 36 UNKNOWN_STATUS, // Unknown status (this should never happen)
37 RENAME_SUCCESSFUL, // Rename of new_chrome.exe to chrome.exe worked 37 RENAME_SUCCESSFUL, // Rename of new_chrome.exe to chrome.exe worked
38 RENAME_FAILED, // Rename of new_chrome.exe failed 38 RENAME_FAILED, // Rename of new_chrome.exe failed
39 EULA_REJECTED, // EULA dialog was not accepted by user. 39 EULA_REJECTED, // EULA dialog was not accepted by user.
40 EULA_ACCEPTED, // EULA dialog was accepted by user. 40 EULA_ACCEPTED, // EULA dialog was accepted by user.
41 EULA_ACCEPTED_OPT_IN, // EULA accepted wtih the crash optin selected. 41 EULA_ACCEPTED_OPT_IN, // EULA accepted wtih the crash optin selected.
42 INSTALL_DIR_IN_USE // Installation directory is in use by another process 42 INSTALL_DIR_IN_USE // Installation directory is in use by another process
43 }; 43 };
44 44
45 // These are distribution related install options specified through command
46 // line switches (see below) or master preference file (see
47 // chrome/installer/util/master_preference.h). The options can be combined,
48 // so they are bit flags.
49 enum InstallOption {
50 // A master profile file is provided to installer.
51 MASTER_PROFILE_PRESENT = 0x1,
52 // The master profile file provided is valid.
53 MASTER_PROFILE_VALID = 0x1 << 1,
54 // Create Desktop and QuickLaunch shortcuts.
55 CREATE_ALL_SHORTCUTS = 0x1 << 2,
56 // Prevent installer from launching Chrome after a successful first install.
57 DO_NOT_LAUNCH_CHROME = 0x1 << 3,
58 // Register Chrome as default browser on the system.
59 MAKE_CHROME_DEFAULT = 0x1 << 4,
60 // Install Chrome to system wise location.
61 SYSTEM_LEVEL = 0x1 << 5,
62 // Run installer in verbose mode.
63 VERBOSE_LOGGING = 0x1 << 6,
64 // Show the EULA dialog.
65 SHOW_EULA_DIALOG = 0x1 << 7,
66 // Use alternate dekstop shortcut text.
67 ALT_DESKTOP_SHORTCUT = 0x1 << 8
68 };
69
70 namespace switches { 45 namespace switches {
71 extern const wchar_t kCreateAllShortcuts[]; 46 extern const wchar_t kCreateAllShortcuts[];
72 extern const wchar_t kDeleteProfile[]; 47 extern const wchar_t kDeleteProfile[];
73 extern const wchar_t kDisableLogging[]; 48 extern const wchar_t kDisableLogging[];
74 extern const wchar_t kDoNotLaunchChrome[]; 49 extern const wchar_t kDoNotLaunchChrome[];
75 extern const wchar_t kDoNotRemoveSharedItems[]; 50 extern const wchar_t kDoNotRemoveSharedItems[];
76 extern const wchar_t kEnableLogging[]; 51 extern const wchar_t kEnableLogging[];
77 extern const wchar_t kForceUninstall[]; 52 extern const wchar_t kForceUninstall[];
78 extern const wchar_t kInstallArchive[]; 53 extern const wchar_t kInstallArchive[];
79 extern const wchar_t kInstallerData[]; 54 extern const wchar_t kInstallerData[];
(...skipping 23 matching lines...) Expand all
103 extern const wchar_t kInstallerDir[]; 78 extern const wchar_t kInstallerDir[];
104 79
105 extern const wchar_t kUninstallStringField[]; 80 extern const wchar_t kUninstallStringField[];
106 extern const wchar_t kUninstallDisplayNameField[]; 81 extern const wchar_t kUninstallDisplayNameField[];
107 extern const wchar_t kUninstallMetricsName[]; 82 extern const wchar_t kUninstallMetricsName[];
108 extern const wchar_t kUninstallInstallationDate[]; 83 extern const wchar_t kUninstallInstallationDate[];
109 84
110 } // namespace installer_util 85 } // namespace installer_util
111 86
112 #endif // CHROME_INSTALLER_UTIL_UTIL_CONSTANTS_H__ 87 #endif // CHROME_INSTALLER_UTIL_UTIL_CONSTANTS_H__
OLDNEW
« no previous file with comments | « chrome/installer/util/master_preferences.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698