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

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

Issue 218683013: Remove stale code to delete the metro user data dir. It never shipped. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: gab comments Created 6 years, 9 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
Index: chrome/installer/util/helper.cc
diff --git a/chrome/installer/util/helper.cc b/chrome/installer/util/helper.cc
index a3c8d3ec54a9c9a0c0ce108ee57c72b66647d059..25f991837d8e9e38df27fde507e55e58c78b46e3 100644
--- a/chrome/installer/util/helper.cc
+++ b/chrome/installer/util/helper.cc
@@ -7,8 +7,6 @@
#include "base/files/file_path.h"
#include "base/logging.h"
#include "base/path_service.h"
-#include "base/win/windows_version.h"
-#include "chrome/common/chrome_constants.h"
#include "chrome/installer/util/browser_distribution.h"
#include "chrome/installer/util/install_util.h"
#include "chrome/installer/util/installation_state.h"
@@ -43,27 +41,8 @@ base::FilePath GetChromeInstallPath(bool system_install,
return GetChromeInstallBasePath(system_install, dist, kInstallBinaryDir);
}
-// TODO(gab): Cleanup this method (kMetroChromeUserDataSubDir is deprecated).
-void GetChromeUserDataPaths(BrowserDistribution* dist,
- std::vector<base::FilePath>* paths) {
- const bool has_metro_data =
- base::win::GetVersion() >= base::win::VERSION_WIN8 &&
- dist->GetDefaultBrowserControlPolicy() !=
- BrowserDistribution::DEFAULT_BROWSER_UNSUPPORTED;
-
- base::FilePath data_dir(GetChromeInstallBasePath(false, dist,
- kInstallUserDataDir));
- if (data_dir.empty()) {
- paths->clear();
- } else {
- paths->resize(has_metro_data ? 2 : 1);
- (*paths)[0] = data_dir;
- if (has_metro_data) {
- (*paths)[1] = data_dir.DirName().Append(
- chrome::kMetroChromeUserDataSubDir);
- }
- }
- DCHECK(!paths->empty());
+base::FilePath GetChromeUserDataPath(BrowserDistribution* dist) {
+ return GetChromeInstallBasePath(false, dist, kInstallUserDataDir);
}
BrowserDistribution* GetBinariesDistribution(bool system_install) {

Powered by Google App Engine
This is Rietveld 408576698