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

Unified Diff: chrome/installer/util/shell_util.cc

Issue 10512026: Fix RegisterChromeBrowser definition and usage in shell_util (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 6 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
« chrome/installer/util/shell_util.h ('K') | « chrome/installer/util/shell_util.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/util/shell_util.cc
diff --git a/chrome/installer/util/shell_util.cc b/chrome/installer/util/shell_util.cc
index ef7177ec96fb95b042d23b8defb0c757c4323347..2109a3c8eec9efd420f497759d9bd3938d8f1f1d 100644
--- a/chrome/installer/util/shell_util.cc
+++ b/chrome/installer/util/shell_util.cc
@@ -1161,12 +1161,9 @@ bool ShellUtil::RegisterChromeForProtocol(BrowserDistribution* dist,
if (IsUserAnAdmin()) {
// We can do this operation directly.
- // If we're not registered at all, try to register. If that fails
- // we should give up.
- if (!IsChromeRegistered(dist, chrome_exe, suffix) &&
- !RegisterChromeBrowser(dist, chrome_exe, suffix, false)) {
+ // First, make sure Chrome is fully registered on this machine.
+ if (!RegisterChromeBrowser(dist, chrome_exe, suffix, false))
return false;
- }
// Write in the capabillity for the protocol.
std::list<RegistryEntry*> entries;
« chrome/installer/util/shell_util.h ('K') | « chrome/installer/util/shell_util.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698