Skip to content

GitLab

T
tangled
Commit c7234190 authored by grt@chromium.org's avatar grt@chromium.org
Browse files
Options

Installer string cleaning following Chrome Frame removal. 

BUG=316496

Review URL: https://codereview.chromium.org/132583002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244305 0039d316-1c4b-4281-b951-d872f2087c98
parent 764c182e
Show whitespace changes
Inline Side-by-side
Showing with 22 additions and 95 deletions
chrome/app/chromium_strings.grd
View file @ c7234190
...@@ -238,9 +238,6 @@ be available for now. --> ...@@ -238,9 +238,6 @@ be available for now. -->
</message> </message>
</if> </if>
<if expr="is_win"> <if expr="is_win">
<message name="IDS_PRODUCT_FRAME_NAME" desc="The Chrome Frame application name">
Chromium Frame
</message>
<message name="IDS_PRODUCT_APP_LAUNCHER_NAME" desc="The Chrome App Launcher application name"> <message name="IDS_PRODUCT_APP_LAUNCHER_NAME" desc="The Chrome App Launcher application name">
Chromium App Launcher Chromium App Launcher
</message> </message>
...@@ -259,30 +256,6 @@ be available for now. --> ...@@ -259,30 +256,6 @@ be available for now. -->
<message name="IDS_PRODUCT_BINARIES_NAME" desc="The Chrome Binaries application name"> <message name="IDS_PRODUCT_BINARIES_NAME" desc="The Chrome Binaries application name">
Chromium Binaries Chromium Binaries
</message> </message>
<message name="IDS_VERSIONMISMATCH_HEADER">
Chromium Frame Update.
</message>
<message name="IDS_VERSIONMISMATCH">
Chromium Frame has been updated. Please relaunch your browser. Chromium version: <ph name="TODO_0001">%ls<ex>TODO</ex></ph>, Chromium Frame version: <ph name="TODO_0002">%ls<ex>TODO</ex></ph>
</message>
<message name="IDS_VERSIONUNKNOWN">
Unknown version.
</message>
<message name="IDS_CHROME_FRAME_MENU_ABOUT" desc="About Chrome Frame label">
About Chromium Frame...
</message>
<message name="IDS_CHROME_FRAME_READY_MODE_LEARN_MORE_URL" desc="Link to knowledge-base article about Chromium Frame Ready Mode">
http://www.google.com/support/chrome/bin/answer.py?hl=[GRITLANGCODE]&amp;answer=161796
</message>
<message name="IDS_CHROME_FRAME_TURNDOWN_LEARN_MORE_URL" desc="Link to knowledge-base article about Chromium Frame's turndown">
http://support.google.com/chrome/?p=ib_chromeframe
</message>
<message name="IDS_CHROME_FRAME_TURNDOWN_TEXT_IE_OLDER" desc="Text of Chromium Frame turndown prompt for IE 6, 7, and 8">
This site is using the Chromium Frame plug-in which will soon be unsupported. Please uninstall it and upgrade to a modern browser.
</message>
<message name="IDS_CHROME_FRAME_TURNDOWN_TEXT_IE_NEWER" desc="Text of Chromium Frame turndown prompt for IE 9 and 10">
This site is using the Chromium Frame plug-in that will soon be unsupported. Please uninstall it and download a compatible browser.
</message>
<message name="IDS_SHORTCUT_NEW_WINDOW" desc="The text label of the New window shortcut context menu entry as of Windows 8"> <message name="IDS_SHORTCUT_NEW_WINDOW" desc="The text label of the New window shortcut context menu entry as of Windows 8">
New window New window
</message> </message>
...@@ -519,9 +492,6 @@ Chromium is unable to recover your settings. ...@@ -519,9 +492,6 @@ Chromium is unable to recover your settings.
<message name="IDS_INSTALL_HIGHER_VERSION_APP_LAUNCHER" desc="Error displayed when higher version of the Chromium App Launcher already exists."> <message name="IDS_INSTALL_HIGHER_VERSION_APP_LAUNCHER" desc="Error displayed when higher version of the Chromium App Launcher already exists.">
This computer already has a more recent version of the Chromium components. Please use a more recent installer. This computer already has a more recent version of the Chromium components. Please use a more recent installer.
</message> </message>
<message name="IDS_INSTALL_SYSTEM_LEVEL_EXISTS" desc="Error displayed during user level install if system level Chromium Frame is already installed.">
Chromium Frame is already installed and available to all users of this computer. If you want to install Chromium Frame at the user level, you must first uninstall the system-level version installed by an administrator.
</message>
<message name="IDS_INSTALL_FAILED" desc="Error displayed if installation fails due to some unknown error."> <message name="IDS_INSTALL_FAILED" desc="Error displayed if installation fails due to some unknown error.">
Installation failed due to unspecified error. If Chromium is currently running, please close it and try again. Installation failed due to unspecified error. If Chromium is currently running, please close it and try again.
</message> </message>
...@@ -550,7 +520,7 @@ Chromium is unable to recover your settings. ...@@ -550,7 +520,7 @@ Chromium is unable to recover your settings.
You do not have appropriate rights for system-level install. Try running the installer again as Administrator. You do not have appropriate rights for system-level install. Try running the installer again as Administrator.
</message> </message>
<message name="IDS_INSTALL_NO_PRODUCTS_TO_UPDATE" desc="Error displayed if the installer is not provided one or more products to install/update."> <message name="IDS_INSTALL_NO_PRODUCTS_TO_UPDATE" desc="Error displayed if the installer is not provided one or more products to install/update.">
No installation of Chromium or Chromium Frame found to update. No installation of Chromium found to update.
</message> </message>
<message name="IDS_UNINSTALL_COMPLETE" desc="Text displayed on dialog that is shown when uninstall is complete and no reboot is required."> <message name="IDS_UNINSTALL_COMPLETE" desc="Text displayed on dialog that is shown when uninstall is complete and no reboot is required.">
Uninstallation complete. Uninstallation complete.
...@@ -558,14 +528,8 @@ Chromium is unable to recover your settings. ...@@ -558,14 +528,8 @@ Chromium is unable to recover your settings.
<message name="IDS_INSTALL_DIR_IN_USE" desc="Error during install if Chromium version is missing from registry but the installation directory exists and can not be deleted."> <message name="IDS_INSTALL_DIR_IN_USE" desc="Error during install if Chromium version is missing from registry but the installation directory exists and can not be deleted.">
Chromium installation directory seems to be in use. Please reboot your computer and try again. Chromium installation directory seems to be in use. Please reboot your computer and try again.
</message> </message>
<message name="IDS_INSTALL_NON_MULTI_INSTALLATION_EXISTS" desc="Error during install if a single-install Chromium or Chromium Frame is present, thereby preventing the installation of a multi-install Chromium or Chromium Frame."> <message name="IDS_INSTALL_MULTI_INSTALLATION_EXISTS" desc="Error during install if a multi-install Chromium is present, thereby preventing the installation of a single-install Chromium.">
A conflicting installation of Chromium or Chromium Frame was found on the system. Please uninstall it and try again. A conflicting installation of Chromium was found on the system. Please uninstall it and try again.
</message>
<message name="IDS_INSTALL_MULTI_INSTALLATION_EXISTS" desc="Error during install if a multi-install Chromium or Chromium Frame is present, thereby preventing the installation of a single-install Chromium or Chromium Frame.">
A conflicting installation of Chromium or Chromium Frame was found on the system. Please uninstall it and try again.
</message>
<message name="IDS_INSTALL_READY_MODE_REQUIRES_CHROME" desc="Chrome Frame in ready mode requires Chrome.">
Invalid arguments. Chromium Frame cannot be installed in ready mode without also installing Chromium.
</message> </message>
<message name="IDS_INSTALL_INCONSISTENT_UPDATE_POLICY" desc="This message does not apply to Chromium."> <message name="IDS_INSTALL_INCONSISTENT_UPDATE_POLICY" desc="This message does not apply to Chromium.">
</message> </message>
......
chrome/app/google_chrome_strings.grd
View file @ c7234190
...@@ -161,9 +161,6 @@ Chrome supports. --> ...@@ -161,9 +161,6 @@ Chrome supports. -->
</message> </message>
</if> </if>
<if expr="is_win"> <if expr="is_win">
<message name="IDS_PRODUCT_FRAME_NAME" desc="The Chrome Frame application name">
Google Chrome Frame
</message>
<message name="IDS_PRODUCT_APP_LAUNCHER_NAME" desc="The Chrome App Launcher application name"> <message name="IDS_PRODUCT_APP_LAUNCHER_NAME" desc="The Chrome App Launcher application name">
Google Chrome App Launcher Google Chrome App Launcher
</message> </message>
...@@ -182,30 +179,6 @@ Chrome supports. --> ...@@ -182,30 +179,6 @@ Chrome supports. -->
<message name="IDS_PRODUCT_BINARIES_NAME" desc="The Chrome Binaries application name"> <message name="IDS_PRODUCT_BINARIES_NAME" desc="The Chrome Binaries application name">
Google Chrome Binaries Google Chrome Binaries
</message> </message>
<message name="IDS_VERSIONMISMATCH_HEADER">
Chrome Frame Update.
</message>
<message name="IDS_VERSIONMISMATCH">
Chrome Frame has been updated. Please relaunch your browser. Chrome version: <ph name="TODO_0001">%ls<ex>TODO</ex></ph>, Chrome Frame version: <ph name="TODO_0002">%ls<ex>TODO</ex></ph>
</message>
<message name="IDS_VERSIONUNKNOWN">
Unknown version.
</message>
<message name="IDS_CHROME_FRAME_MENU_ABOUT" desc="About Chrome Frame label">
About Chrome Frame...
</message>
<message name="IDS_CHROME_FRAME_READY_MODE_LEARN_MORE_URL" desc="Link to knowledge-base article about Chrome Frame Ready Mode">
http://www.google.com/support/chrome/bin/answer.py?hl=[GRITLANGCODE]&amp;answer=161796
</message>
<message name="IDS_CHROME_FRAME_TURNDOWN_LEARN_MORE_URL" desc="Link to knowledge-base article about Chrome Frame turndown">
http://support.google.com/chrome/?p=ib_chromeframe
</message>
<message name="IDS_CHROME_FRAME_TURNDOWN_TEXT_IE_OLDER" desc="Text of Chrome Frame turndown prompt for IE 6, 7, and 8">
This site is using the retired Chrome Frame plug-in which no longer receives security and stability updates. Please uninstall it and upgrade to a modern browser.
</message>
<message name="IDS_CHROME_FRAME_TURNDOWN_TEXT_IE_NEWER" desc="Text of Chrome Frame turndown prompt for IE 9 and 10">
This site is using the retired Chrome Frame plug-in which no longer receives security and stability updates. Please uninstall it and upgrade to a modern browser.
</message>
<message name="IDS_SHORTCUT_NEW_WINDOW" desc="The text label of the New window shortcut context menu entry as of Windows 8"> <message name="IDS_SHORTCUT_NEW_WINDOW" desc="The text label of the New window shortcut context menu entry as of Windows 8">
New window New window
</message> </message>
...@@ -442,9 +415,6 @@ Google Chrome is unable to recover your settings. ...@@ -442,9 +415,6 @@ Google Chrome is unable to recover your settings.
<message name="IDS_INSTALL_HIGHER_VERSION_APP_LAUNCHER" desc="Error displayed when higher version of the Chrome App Launcher already exists."> <message name="IDS_INSTALL_HIGHER_VERSION_APP_LAUNCHER" desc="Error displayed when higher version of the Chrome App Launcher already exists.">
This computer already has a more recent version of the Google Chrome components. Please use a more recent installer. This computer already has a more recent version of the Google Chrome components. Please use a more recent installer.
</message> </message>
<message name="IDS_INSTALL_SYSTEM_LEVEL_EXISTS" desc="Error displayed during user level install if system level Chrome Frame is already installed.">
Google Chrome Frame is already installed and available to all users of this computer. If you want to install Google Chrome Frame at the user level, you must first uninstall the system-level version installed by an administrator.
</message>
<message name="IDS_INSTALL_FAILED" desc="Error displayed if installation fails due to some unknown error."> <message name="IDS_INSTALL_FAILED" desc="Error displayed if installation fails due to some unknown error.">
Installation failed due to unspecified error. If Google Chrome is currently running, please close it and try again. Installation failed due to unspecified error. If Google Chrome is currently running, please close it and try again.
</message> </message>
...@@ -473,7 +443,7 @@ Google Chrome is unable to recover your settings. ...@@ -473,7 +443,7 @@ Google Chrome is unable to recover your settings.
You do not have appropriate rights for system-level install. Try running the installer again as Administrator. You do not have appropriate rights for system-level install. Try running the installer again as Administrator.
</message> </message>
<message name="IDS_INSTALL_NO_PRODUCTS_TO_UPDATE" desc="Error displayed if the installer is not provided one or more products to install/update."> <message name="IDS_INSTALL_NO_PRODUCTS_TO_UPDATE" desc="Error displayed if the installer is not provided one or more products to install/update.">
No installation of Google Chrome or Google Chrome Frame found to update. No installation of Google Chrome found to update.
</message> </message>
<message name="IDS_UNINSTALL_COMPLETE" desc="Text displayed on dialog that is shown when uninstall is complete and no reboot is required."> <message name="IDS_UNINSTALL_COMPLETE" desc="Text displayed on dialog that is shown when uninstall is complete and no reboot is required.">
Uninstallation complete. Uninstallation complete.
...@@ -481,17 +451,11 @@ Google Chrome is unable to recover your settings. ...@@ -481,17 +451,11 @@ Google Chrome is unable to recover your settings.
<message name="IDS_INSTALL_DIR_IN_USE" desc="Error during install if Google Chrome version is missing from registry but the installation directory exists and can not be deleted."> <message name="IDS_INSTALL_DIR_IN_USE" desc="Error during install if Google Chrome version is missing from registry but the installation directory exists and can not be deleted.">
Google Chrome installation directory seems to be in use. Please reboot your computer and try again. Google Chrome installation directory seems to be in use. Please reboot your computer and try again.
</message> </message>
<message name="IDS_INSTALL_NON_MULTI_INSTALLATION_EXISTS" desc="Error during install if a single-install Google Chrome or Google Chrome Frame is present, thereby preventing the installation of a multi-install Google Chrome or Google Chrome Frame."> <message name="IDS_INSTALL_MULTI_INSTALLATION_EXISTS" desc="Error during install if a multi-install Google Chrome is present, thereby preventing the installation of a single-install Google Chrome.">
A conflicting installation of Google Chrome or Google Chrome Frame was found on the system. Please uninstall it and try again. A conflicting installation of Google Chrome was found on the system. Please uninstall it and try again.
</message>
<message name="IDS_INSTALL_MULTI_INSTALLATION_EXISTS" desc="Error during install if a multi-install Google Chrome or Google Chrome Frame is present, thereby preventing the installation of a single-install Google Chrome or Google Chrome Frame.">
A conflicting installation of Google Chrome or Google Chrome Frame was found on the system. Please uninstall it and try again.
</message>
<message name="IDS_INSTALL_READY_MODE_REQUIRES_CHROME" desc="Chrome Frame in ready mode requires Chrome.">
Invalid arguments. Google Chrome Frame cannot be installed in ready mode without also installing Google Chrome.
</message> </message>
<message name="IDS_INSTALL_INCONSISTENT_UPDATE_POLICY" desc="Error during install if the update policies settings in Group Policy are inconsistent."> <message name="IDS_INSTALL_INCONSISTENT_UPDATE_POLICY" desc="Error during install if the update policies settings in Group Policy are inconsistent.">
Google Chrome or Google Chrome Frame cannot be updated due to inconsistent Google Update Group Policy settings. Use the Group Policy Editor to set the update policy override for the Google Chrome Binaries application and try again; see http://goo.gl/uJ9gV for details. Google Chrome cannot be updated due to inconsistent Google Update Group Policy settings. Use the Group Policy Editor to set the update policy override for the Google Chrome Binaries application and try again; see http://goo.gl/uJ9gV for details.
</message> </message>
<!-- Options Dialog --> <!-- Options Dialog -->
<message name="IDS_OPTIONS_IMPROVE_BROWSING_EXPERIENCE" desc="The text in the options panel that describes how we use web services to improve browsing experience."> <message name="IDS_OPTIONS_IMPROVE_BROWSING_EXPERIENCE" desc="The text in the options panel that describes how we use web services to improve browsing experience.">
......
chrome/installer/setup/setup_main.cc
View file @ c7234190
...@@ -581,10 +581,9 @@ bool CheckPreInstallConditions(const InstallationState& original_state, ...@@ -581,10 +581,9 @@ bool CheckPreInstallConditions(const InstallationState& original_state,
base::LaunchProcess(cmd, base::LaunchOptions(), NULL); base::LaunchProcess(cmd, base::LaunchOptions(), NULL);
} }
} else { } else {
// Display an error message for other products. // It's no longer possible for |product| to be anything other than
*status = installer::SYSTEM_LEVEL_INSTALL_EXISTS; // Chrome.
installer_state->WriteInstallerResult( NOTREACHED();
*status, IDS_INSTALL_SYSTEM_LEVEL_EXISTS_BASE, NULL);
} }
return false; return false;
} }
......
chrome/installer/util/chrome_frame_distribution.cc
View file @ c7234190
...@@ -46,16 +46,18 @@ base::string16 ChromeFrameDistribution::GetBrowserProgIdDesc() { ...@@ -46,16 +46,18 @@ base::string16 ChromeFrameDistribution::GetBrowserProgIdDesc() {
return base::string16(); return base::string16();
} }
base::string16 ChromeFrameDistribution::GetDisplayName() {
#if defined(GOOGLE_CHROME_BUILD)
return L"Google Chrome Frame";
#else
return L"Chromium Frame";
#endif
}
base::string16 ChromeFrameDistribution::GetShortcutName( base::string16 ChromeFrameDistribution::GetShortcutName(
ShortcutType shortcut_type) { ShortcutType shortcut_type) {
switch (shortcut_type) {
case SHORTCUT_CHROME:
case SHORTCUT_CHROME_ALTERNATE:
return installer::GetLocalizedString(IDS_PRODUCT_FRAME_NAME_BASE);
default:
NOTREACHED(); NOTREACHED();
return base::string16(); return base::string16();
}
} }
base::string16 ChromeFrameDistribution::GetInstallSubDir() { base::string16 ChromeFrameDistribution::GetInstallSubDir() {
......
chrome/installer/util/chrome_frame_distribution.h
View file @ c7234190
...@@ -19,6 +19,8 @@ class ChromeFrameDistribution : public BrowserDistribution { ...@@ -19,6 +19,8 @@ class ChromeFrameDistribution : public BrowserDistribution {
virtual base::string16 GetBrowserProgIdDesc() OVERRIDE; virtual base::string16 GetBrowserProgIdDesc() OVERRIDE;
virtual base::string16 GetDisplayName() OVERRIDE;
virtual base::string16 GetShortcutName(ShortcutType shortcut_type) OVERRIDE; virtual base::string16 GetShortcutName(ShortcutType shortcut_type) OVERRIDE;
virtual int GetIconIndex(ShortcutType shortcut_type) OVERRIDE; virtual int GetIconIndex(ShortcutType shortcut_type) OVERRIDE;
......
chrome/installer/util/prebuild/create_string_rc.py
View file @ c7234190
...@@ -47,12 +47,10 @@ kStringIds = [ ...@@ -47,12 +47,10 @@ kStringIds = [
'IDS_PRODUCT_APP_LAUNCHER_NAME', 'IDS_PRODUCT_APP_LAUNCHER_NAME',
'IDS_PRODUCT_BINARIES_NAME', 'IDS_PRODUCT_BINARIES_NAME',
'IDS_PRODUCT_DESCRIPTION', 'IDS_PRODUCT_DESCRIPTION',
'IDS_PRODUCT_FRAME_NAME',
'IDS_UNINSTALL_CHROME', 'IDS_UNINSTALL_CHROME',
'IDS_ABOUT_VERSION_COMPANY_NAME', 'IDS_ABOUT_VERSION_COMPANY_NAME',
'IDS_INSTALL_HIGHER_VERSION', 'IDS_INSTALL_HIGHER_VERSION',
'IDS_INSTALL_HIGHER_VERSION_APP_LAUNCHER', 'IDS_INSTALL_HIGHER_VERSION_APP_LAUNCHER',
'IDS_INSTALL_SYSTEM_LEVEL_EXISTS',
'IDS_INSTALL_FAILED', 'IDS_INSTALL_FAILED',
'IDS_SAME_VERSION_REPAIR_FAILED', 'IDS_SAME_VERSION_REPAIR_FAILED',
'IDS_SETUP_PATCH_FAILED', 'IDS_SETUP_PATCH_FAILED',
...@@ -65,9 +63,7 @@ kStringIds = [ ...@@ -65,9 +63,7 @@ kStringIds = [
'IDS_INSTALL_NO_PRODUCTS_TO_UPDATE', 'IDS_INSTALL_NO_PRODUCTS_TO_UPDATE',
'IDS_UNINSTALL_COMPLETE', 'IDS_UNINSTALL_COMPLETE',
'IDS_INSTALL_DIR_IN_USE', 'IDS_INSTALL_DIR_IN_USE',
'IDS_INSTALL_NON_MULTI_INSTALLATION_EXISTS',
'IDS_INSTALL_MULTI_INSTALLATION_EXISTS', 'IDS_INSTALL_MULTI_INSTALLATION_EXISTS',
'IDS_INSTALL_READY_MODE_REQUIRES_CHROME',
'IDS_INSTALL_INCONSISTENT_UPDATE_POLICY', 'IDS_INSTALL_INCONSISTENT_UPDATE_POLICY',
'IDS_OEM_MAIN_SHORTCUT_NAME', 'IDS_OEM_MAIN_SHORTCUT_NAME',
'IDS_SHORTCUT_TOOLTIP', 'IDS_SHORTCUT_TOOLTIP',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment