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

Side by Side Diff: chrome/installer/util/helper.cc

Issue 23258005: Give SxS distribution its own registration GUIDs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove magic key combo from browser_options_handler.cc Created 7 years, 3 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/installer/util/helper.h" 5 #include "chrome/installer/util/helper.h"
6 6
7 #include "base/files/file_path.h" 7 #include "base/files/file_path.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/path_service.h" 9 #include "base/path_service.h"
10 #include "base/win/windows_version.h" 10 #include "base/win/windows_version.h"
(...skipping 25 matching lines...) Expand all
36 36
37 } // namespace 37 } // namespace
38 38
39 namespace installer { 39 namespace installer {
40 40
41 base::FilePath GetChromeInstallPath(bool system_install, 41 base::FilePath GetChromeInstallPath(bool system_install,
42 BrowserDistribution* dist) { 42 BrowserDistribution* dist) {
43 return GetChromeInstallBasePath(system_install, dist, kInstallBinaryDir); 43 return GetChromeInstallBasePath(system_install, dist, kInstallBinaryDir);
44 } 44 }
45 45
46 void GetChromeUserDataPaths(BrowserDistribution* dist, 46 void GetChromeUserDataPaths(BrowserDistribution* dist,
gab 2013/09/06 18:40:08 I doubt we even need this method anymore... the Me
grt (UTC plus 2) 2013/09/09 18:39:15 Yes, this is history. I think it can be removed (i
47 std::vector<base::FilePath>* paths) { 47 std::vector<base::FilePath>* paths) {
48 const bool has_metro_data = dist->CanSetAsDefault() && 48 const bool has_metro_data = dist->IsSetAsDefaultSupported() &&
49 base::win::GetVersion() >= base::win::VERSION_WIN8; 49 base::win::GetVersion() >= base::win::VERSION_WIN8;
50 base::FilePath data_dir(GetChromeInstallBasePath(false, dist, 50 base::FilePath data_dir(GetChromeInstallBasePath(false, dist,
51 kInstallUserDataDir)); 51 kInstallUserDataDir));
52 if (data_dir.empty()) { 52 if (data_dir.empty()) {
53 paths->clear(); 53 paths->clear();
54 } else { 54 } else {
55 paths->resize(has_metro_data ? 2 : 1); 55 paths->resize(has_metro_data ? 2 : 1);
56 (*paths)[0] = data_dir; 56 (*paths)[0] = data_dir;
57 if (has_metro_data) { 57 if (has_metro_data) {
58 (*paths)[1] = data_dir.DirName().Append( 58 (*paths)[1] = data_dir.DirName().Append(
(...skipping 17 matching lines...) Expand all
76 } else { 76 } else {
77 return dist; 77 return dist;
78 } 78 }
79 } 79 }
80 80
81 std::wstring GetAppGuidForUpdates(bool system_install) { 81 std::wstring GetAppGuidForUpdates(bool system_install) {
82 return GetBinariesDistribution(system_install)->GetAppGuid(); 82 return GetBinariesDistribution(system_install)->GetAppGuid();
83 } 83 }
84 84
85 } // namespace installer. 85 } // namespace installer.
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698