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

Side by Side Diff: chrome/install_static/google_chrome_install_modes.cc

Issue 2689233005: Move brand- and mode-specific app icon resource id into InstallConstants. (Closed)
Patch Set: Created 3 years, 10 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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 // Brand-specific constants and install modes for Google Chrome. 5 // Brand-specific constants and install modes for Google Chrome.
6 6
7 #include <stdlib.h> 7 #include <stdlib.h>
8 8
9 #include "chrome/app/chrome_dll_resource.h"
9 #include "chrome/install_static/install_modes.h" 10 #include "chrome/install_static/install_modes.h"
10 11
11 namespace install_static { 12 namespace install_static {
12 13
13 const wchar_t kCompanyPathName[] = L"Google"; 14 const wchar_t kCompanyPathName[] = L"Google";
14 15
15 const wchar_t kProductPathName[] = L"Chrome"; 16 const wchar_t kProductPathName[] = L"Chrome";
16 17
17 const size_t kProductPathNameLength = _countof(kProductPathName) - 1; 18 const size_t kProductPathNameLength = _countof(kProductPathName) - 1;
18 19
19 const wchar_t kBinariesAppGuid[] = L"{4DC8B4CA-1BDA-483e-B5FA-D3C12E15B62D}"; 20 const wchar_t kBinariesAppGuid[] = L"{4DC8B4CA-1BDA-483e-B5FA-D3C12E15B62D}";
20 21
21 // Google Chrome integrates with Google Update, so the app GUID above is used. 22 // Google Chrome integrates with Google Update, so the app GUID above is used.
22 const wchar_t kBinariesPathName[] = L""; 23 const wchar_t kBinariesPathName[] = L"";
23 24
24 const InstallConstants kInstallModes[] = { 25 const InstallConstants kInstallModes[] = {
25 // clang-format off 26 // clang-format off
26 // The primary install mode for stable Google Chrome. 27 // The primary install mode for stable Google Chrome.
27 { 28 {
28 sizeof(kInstallModes[0]), 29 sizeof(kInstallModes[0]),
29 STABLE_INDEX, 30 STABLE_INDEX,
30 "", // No install switch for the primary install mode. 31 "", // No install switch for the primary install mode.
31 L"", // Empty install_suffix for the primary install mode. 32 L"", // Empty install_suffix for the primary install mode.
32 L"", // No logo suffix for the primary install mode. 33 L"", // No logo suffix for the primary install mode.
33 L"{8A69D345-D564-463c-AFF1-A69D9E530F96}", 34 L"{8A69D345-D564-463c-AFF1-A69D9E530F96}",
34 L"", // The empty string means "stable". 35 L"", // The empty string means "stable".
35 ChannelStrategy::ADDITIONAL_PARAMETERS, 36 ChannelStrategy::ADDITIONAL_PARAMETERS,
36 true, // Supports system-level installs. 37 true, // Supports system-level installs.
37 true, // Supported multi-install. 38 true, // Supported multi-install.
39 IDR_MAINFRAME,
38 }, 40 },
39 { 41 {
40 sizeof(kInstallModes[0]), 42 sizeof(kInstallModes[0]),
41 CANARY_INDEX, 43 CANARY_INDEX,
42 "chrome-sxs", 44 "chrome-sxs",
43 L" SxS", 45 L" SxS",
44 L"Canary", 46 L"Canary",
45 L"{4ea16ac7-fd5a-47c3-875b-dbf4a2008c20}", 47 L"{4ea16ac7-fd5a-47c3-875b-dbf4a2008c20}",
46 L"canary", 48 L"canary",
47 ChannelStrategy::FIXED, 49 ChannelStrategy::FIXED,
48 false, // Does not support system-level installs. 50 false, // Does not support system-level installs.
49 false, // Did not support multi-install. 51 false, // Did not support multi-install.
52 IDR_SXS,
50 }, 53 },
51 // clang-format on 54 // clang-format on
52 }; 55 };
53 56
54 static_assert(_countof(kInstallModes) == NUM_INSTALL_MODES, 57 static_assert(_countof(kInstallModes) == NUM_INSTALL_MODES,
55 "Imbalance between kInstallModes and InstallConstantIndex"); 58 "Imbalance between kInstallModes and InstallConstantIndex");
56 59
57 } // namespace install_static 60 } // namespace install_static
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698