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

Unified Diff: chrome/browser/shell_integration_win.cc

Issue 10451074: Always suffix ChromeHTML entries on Windows for user-level installs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: nit Created 8 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/installer/setup/uninstall.cc » ('j') | chrome/installer/setup/uninstall.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/shell_integration_win.cc
diff --git a/chrome/browser/shell_integration_win.cc b/chrome/browser/shell_integration_win.cc
index f4c8609f43ec88bc8c84e97eb715f7ec009cafb8..116165116602d7c348da87d71ea6a355c5a43bf2 100644
--- a/chrome/browser/shell_integration_win.cc
+++ b/chrome/browser/shell_integration_win.cc
@@ -76,14 +76,7 @@ ShellIntegration::DefaultWebClientState ProbeCurrentDefaultHandlers(
return ShellIntegration::UNKNOWN_DEFAULT_WEB_CLIENT;
string16 prog_id(ShellUtil::kChromeHTMLProgId);
-
- // If a user specific default browser entry exists, we check for that ProgID
- // being default. If not, then the ProgID is ChromeHTML or ChromiumHTML so we
- // do not append a suffix to the ProgID.
- string16 suffix;
- BrowserDistribution* dist = BrowserDistribution::GetDistribution();
- if (ShellUtil::GetUserSpecificDefaultBrowserSuffix(dist, &suffix))
- prog_id += suffix;
+ prog_id += ShellUtil::GetCurrentInstallationSuffix();
for (size_t i = 0; i < num_protocols; ++i) {
base::win::ScopedCoMem<wchar_t> current_app;
@@ -109,13 +102,7 @@ ShellIntegration::DefaultWebClientState ProbeAppIsDefaultHandlers(
BrowserDistribution* dist = BrowserDistribution::GetDistribution();
string16 app_name(dist->GetApplicationName());
-
- // If a user specific default browser entry exists, we check for that
- // app name being default. If not, then default browser is just called
- // Google Chrome or Chromium so we do not append a suffix to the app name.
- string16 suffix;
- if (ShellUtil::GetUserSpecificDefaultBrowserSuffix(dist, &suffix))
- app_name += suffix;
+ app_name += ShellUtil::GetCurrentInstallationSuffix();
BOOL result;
for (size_t i = 0; i < num_protocols; ++i) {
« no previous file with comments | « no previous file | chrome/installer/setup/uninstall.cc » ('j') | chrome/installer/setup/uninstall.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698