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

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

Issue 2619323003: Remove uses of BrowserDistribution::CHROME_BINARIES in installer_util. (Closed)
Patch Set: Created 3 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
« chrome/installer/util/helper.h ('K') | « chrome/installer/util/helper.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/helper.cc
diff --git a/chrome/installer/util/helper.cc b/chrome/installer/util/helper.cc
index 56089b1c0b2c83267d7247d5983b336d84d1cd2b..0acfe4c22fa313fe869410cd66caf102e6acbc81 100644
--- a/chrome/installer/util/helper.cc
+++ b/chrome/installer/util/helper.cc
@@ -5,11 +5,8 @@
#include "chrome/installer/util/helper.h"
#include "base/files/file_path.h"
-#include "base/logging.h"
#include "base/path_service.h"
#include "chrome/installer/util/browser_distribution.h"
-#include "chrome/installer/util/install_util.h"
-#include "chrome/installer/util/installation_state.h"
#include "chrome/installer/util/util_constants.h"
namespace installer {
@@ -32,20 +29,4 @@ base::FilePath GetChromeInstallPath(bool system_install,
return install_path;
}
-BrowserDistribution* GetBinariesDistribution(bool system_install) {
- ProductState state;
-
- // 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. If we can't read the app's
- // state from the registry, assume it isn't multi-installed.
- if (!state.Initialize(system_install) || !state.is_multi_install())
- return BrowserDistribution::GetDistribution();
- return BrowserDistribution::GetSpecificDistribution(
- BrowserDistribution::CHROME_BINARIES);
-}
-
-std::wstring GetAppGuidForUpdates(bool system_install) {
- return GetBinariesDistribution(system_install)->GetAppGuid();
-}
-
} // namespace installer.
« chrome/installer/util/helper.h ('K') | « chrome/installer/util/helper.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698