diff options
| author | kuchhal@chromium.org <kuchhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-15 21:37:46 +0000 |
|---|---|---|
| committer | kuchhal@chromium.org <kuchhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-15 21:37:46 +0000 |
| commit | 68c921f8b5d6454307645d4017a3cbf2646904bc (patch) | |
| tree | fdd0d0138a4ce706e052de4bab66fa3c4b28b8d4 /chrome/app | |
| parent | 9c6c3065723227dee6bca91df24bb6863ac123f9 (diff) | |
| download | chromium_src-68c921f8b5d6454307645d4017a3cbf2646904bc.zip chromium_src-68c921f8b5d6454307645d4017a3cbf2646904bc.tar.gz chromium_src-68c921f8b5d6454307645d4017a3cbf2646904bc.tar.bz2 | |
Add a check in Chrome to not run user level mode if machine level Chrome
is already installed.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3423 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
| -rw-r--r-- | chrome/app/chromium_strings.grd | 3 | ||||
| -rw-r--r-- | chrome/app/google_chrome_strings.grd | 3 | ||||
| -rw-r--r-- | chrome/app/result_codes.h | 1 |
3 files changed, 7 insertions, 0 deletions
diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd index c0f7818..f948d6b 100644 --- a/chrome/app/chromium_strings.grd +++ b/chrome/app/chromium_strings.grd @@ -211,6 +211,9 @@ be available for now. --> <message name="IDS_CANT_WRITE_USER_DIRECTORY_EXIT_BUTTON" desc="Text on button of dialog that closes Chrome if we can't create a directory for this user."> Exit Chromium </message> + <message name="IDS_MACHINE_LEVEL_INSTALL_CONFLICT" desc="Error message to display when user tries to run user level Chromium even though machine level Chromium is already installed."> + System level Chromium is already installed on this computer. We will replace your user level Chromium with the system level installation. + </message> </messages> </release> </grit> diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_strings.grd index 95035dd..70d27f2 100644 --- a/chrome/app/google_chrome_strings.grd +++ b/chrome/app/google_chrome_strings.grd @@ -250,6 +250,9 @@ Chrome supports. --> <message name="IDS_CANT_WRITE_USER_DIRECTORY_EXIT_BUTTON" desc="Text on button of dialog that closes Chrome if we can't create a directory for this user."> Exit Chrome </message> + <message name="IDS_MACHINE_LEVEL_INSTALL_CONFLICT" desc="Error message to display when user tries to run user level Chromium even though machine level Chromium is already installed."> + System level Google Chrome is already installed on this computer. We will replace your user level Google Chrome with the system level installation. + </message> </messages> </release> </grit> diff --git a/chrome/app/result_codes.h b/chrome/app/result_codes.h index d0e6a9b..e03a8bc 100644 --- a/chrome/app/result_codes.h +++ b/chrome/app/result_codes.h @@ -27,6 +27,7 @@ class ResultCodes { MISSING_PATH, // An critical chrome path is missing. MISSING_DATA, // A critical chrome file is missing. SHELL_INTEGRATION_FAILED, // Failed to make Chrome default browser. + MACHINE_LEVEL_INSTALL_EXISTS, // Machine level install exists UNINSTALL_DELETE_FILE_ERROR,// Error while deleting shortcuts. UNINSTALL_CHROME_ALIVE, // Uninstall detected another chrome instance. UNINSTALL_NO_SURVEY, // Do not launch survey after uninstall. |