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

Side by Side 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 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"
9 #include "base/path_service.h" 8 #include "base/path_service.h"
10 #include "chrome/installer/util/browser_distribution.h" 9 #include "chrome/installer/util/browser_distribution.h"
11 #include "chrome/installer/util/install_util.h"
12 #include "chrome/installer/util/installation_state.h"
13 #include "chrome/installer/util/util_constants.h" 10 #include "chrome/installer/util/util_constants.h"
14 11
15 namespace installer { 12 namespace installer {
16 13
17 base::FilePath GetChromeInstallPath(bool system_install, 14 base::FilePath GetChromeInstallPath(bool system_install,
18 BrowserDistribution* dist) { 15 BrowserDistribution* dist) {
19 base::FilePath install_path; 16 base::FilePath install_path;
20 #if defined(_WIN64) 17 #if defined(_WIN64)
21 // TODO(wfh): Place Chrome binaries into DIR_PROGRAM_FILESX86 until the code 18 // TODO(wfh): Place Chrome binaries into DIR_PROGRAM_FILESX86 until the code
22 // to support moving the binaries is added. 19 // to support moving the binaries is added.
23 int key = 20 int key =
24 system_install ? base::DIR_PROGRAM_FILESX86 : base::DIR_LOCAL_APP_DATA; 21 system_install ? base::DIR_PROGRAM_FILESX86 : base::DIR_LOCAL_APP_DATA;
25 #else 22 #else
26 int key = system_install ? base::DIR_PROGRAM_FILES : base::DIR_LOCAL_APP_DATA; 23 int key = system_install ? base::DIR_PROGRAM_FILES : base::DIR_LOCAL_APP_DATA;
27 #endif 24 #endif
28 if (PathService::Get(key, &install_path)) { 25 if (PathService::Get(key, &install_path)) {
29 install_path = install_path.Append(dist->GetInstallSubDir()); 26 install_path = install_path.Append(dist->GetInstallSubDir());
30 install_path = install_path.Append(kInstallBinaryDir); 27 install_path = install_path.Append(kInstallBinaryDir);
31 } 28 }
32 return install_path; 29 return install_path;
33 } 30 }
34 31
35 BrowserDistribution* GetBinariesDistribution(bool system_install) {
36 ProductState state;
37
38 // If we're part of a multi-install, we need to poll using the multi-installer
39 // package's app guid rather than the browser's. If we can't read the app's
40 // state from the registry, assume it isn't multi-installed.
41 if (!state.Initialize(system_install) || !state.is_multi_install())
42 return BrowserDistribution::GetDistribution();
43 return BrowserDistribution::GetSpecificDistribution(
44 BrowserDistribution::CHROME_BINARIES);
45 }
46
47 std::wstring GetAppGuidForUpdates(bool system_install) {
48 return GetBinariesDistribution(system_install)->GetAppGuid();
49 }
50
51 } // namespace installer. 32 } // namespace installer.
OLDNEW
« 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