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

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

Issue 6100003: Update checks of multi-installs now use the proper app guid.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 11 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 | « chrome/installer/util/helper.h ('k') | chrome/installer/util/package_properties.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/util/helper.cc
===================================================================
--- chrome/installer/util/helper.cc (revision 70612)
+++ chrome/installer/util/helper.cc (working copy)
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -12,6 +12,7 @@
#include "chrome/installer/util/browser_distribution.h"
#include "chrome/installer/util/install_util.h"
#include "chrome/installer/util/master_preferences.h"
+#include "chrome/installer/util/package_properties.h"
using base::win::RegKey;
@@ -126,4 +127,14 @@
return GetChromeInstallPath(system_install, chrome);
}
+std::wstring GetAppGuidForUpdates(bool system_install) {
+ BrowserDistribution* dist = BrowserDistribution::GetDistribution();
+
+ // If we're part of a multi-install, we need to poll using the multi-installer
+ // package's app guid rather than the browser's or Chrome Frame's app guid.
+ return IsInstalledAsMulti(system_install, dist) ?
+ ActivePackageProperties().GetAppGuid() :
+ dist->GetAppGuid();
+}
+
} // namespace installer.
« no previous file with comments | « chrome/installer/util/helper.h ('k') | chrome/installer/util/package_properties.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698