summaryrefslogtreecommitdiffstats
path: root/chrome/installer/util/browser_distribution.h
diff options
context:
space:
mode:
authorgrt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-02 15:34:07 +0000
committergrt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-02 15:34:07 +0000
commitf1a761f802d0c1712571d4bca05af620cda5eee6 (patch)
tree00dbe54c53d6563d7b9a60c27dc11adf6d70c047 /chrome/installer/util/browser_distribution.h
parentd583c3a30db9474b0dcef5128ec6901c8ff23b98 (diff)
downloadchromium_src-f1a761f802d0c1712571d4bca05af620cda5eee6.zip
chromium_src-f1a761f802d0c1712571d4bca05af620cda5eee6.tar.gz
chromium_src-f1a761f802d0c1712571d4bca05af620cda5eee6.tar.bz2
Fix default browser registration for simplified chinese installs.
http://crrev.com/13341 and http://crrev.com/13906, which fixed http://crbug.com/9697, switched from using chrome.exe as the canonical name of Chrome (for purposes of shell registration) to using the localized application name (e.g., "Chromium" or "Google Chrome"). This is problematic since there are differences between the various locales as to what the app name is. This change switches to using a non-localized version of the product name. The right thing to do would really be to switch back to using the executable name (as prescribed by MSDN), except for the case of Chromium builds, where "chromium.exe" could be used. Making that change now would mean potentially re-prompting users to make Chrome their default browser, which would be bad. BUG=92445 TEST=Verify that Google Chrome and Chromium builds can coexist, and that each can be made the default browser. Furthermore, ensure that, for user-level and system-level installs, all of the usual shell registration things work: the Start Menu's "Internet" link (icon and action), running "chrome.exe" (without path) from the Run... dialog, clicking a link in some other program, typeing a URL into the Run... dialog, "Set your default programs" control panel, "Set program access and computer defaults" control panel. Also, verify that if Chrome is installed using zn-CH locale and made the default, that switching to another locale (like en-US) doesn't cause Chrome to prompt to become the default browser. Review URL: http://codereview.chromium.org/8384038 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@108297 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer/util/browser_distribution.h')
-rw-r--r--chrome/installer/util/browser_distribution.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/installer/util/browser_distribution.h b/chrome/installer/util/browser_distribution.h
index 6d92501..58ab51c 100644
--- a/chrome/installer/util/browser_distribution.h
+++ b/chrome/installer/util/browser_distribution.h
@@ -70,8 +70,11 @@ class BrowserDistribution {
virtual std::wstring GetAppGuid();
+ // Returns the name by which the program is registered with Default Programs.
+ // This is not a localized string suitable for presenting to a user.
virtual std::wstring GetApplicationName();
+ // Returns the localized name of the program.
virtual std::wstring GetAppShortCutName();
virtual std::wstring GetAlternateApplicationName();