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

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

Issue 2622883002: Remove BrowserDistribution::Type. (Closed)
Patch Set: fdoray comments 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
« no previous file with comments | « chrome/installer/util/browser_distribution.h ('k') | chrome/installer/util/google_chrome_distribution.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/util/browser_distribution.cc
diff --git a/chrome/installer/util/browser_distribution.cc b/chrome/installer/util/browser_distribution.cc
index 8e83dda2763a30bbbe12d3f18791837939e726d2..41be776333aa8b571637bd80af4245d401254c78 100644
--- a/chrome/installer/util/browser_distribution.cc
+++ b/chrome/installer/util/browser_distribution.cc
@@ -41,21 +41,16 @@ const wchar_t kCommandExecuteImplUuid[] =
// The BrowserDistribution objects are never freed.
BrowserDistribution* g_browser_distribution = NULL;
-BrowserDistribution::Type GetCurrentDistributionType() {
- return BrowserDistribution::CHROME_BROWSER;
-}
} // namespace
BrowserDistribution::BrowserDistribution()
- : type_(CHROME_BROWSER),
- app_reg_data_(base::MakeUnique<NonUpdatingAppRegistrationData>(
+ : app_reg_data_(base::MakeUnique<NonUpdatingAppRegistrationData>(
L"Software\\Chromium")) {}
BrowserDistribution::BrowserDistribution(
- Type type,
std::unique_ptr<AppRegistrationData> app_reg_data)
- : type_(type), app_reg_data_(std::move(app_reg_data)) {}
+ : app_reg_data_(std::move(app_reg_data)) {}
BrowserDistribution::~BrowserDistribution() {}
@@ -73,14 +68,8 @@ BrowserDistribution* BrowserDistribution::GetOrCreateBrowserDistribution(
return *dist;
}
-BrowserDistribution* BrowserDistribution::GetDistribution() {
- return GetSpecificDistribution(GetCurrentDistributionType());
-}
-
// static
-BrowserDistribution* BrowserDistribution::GetSpecificDistribution(
- BrowserDistribution::Type type) {
- DCHECK_EQ(type, CHROME_BROWSER);
+BrowserDistribution* BrowserDistribution::GetDistribution() {
BrowserDistribution* dist = NULL;
#if defined(GOOGLE_CHROME_BUILD)
« no previous file with comments | « chrome/installer/util/browser_distribution.h ('k') | chrome/installer/util/google_chrome_distribution.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698