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

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: sync to position 453103 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 // A secondary install mode for Google Chrome SxS (canary). 41 // A secondary install mode for Google Chrome SxS (canary).
40 { 42 {
41 sizeof(kInstallModes[0]), 43 sizeof(kInstallModes[0]),
42 CANARY_INDEX, 44 CANARY_INDEX,
43 "chrome-sxs", 45 "chrome-sxs",
44 L" SxS", 46 L" SxS",
45 L"Canary", 47 L"Canary",
46 L"{4ea16ac7-fd5a-47c3-875b-dbf4a2008c20}", 48 L"{4ea16ac7-fd5a-47c3-875b-dbf4a2008c20}",
47 L"canary", 49 L"canary",
48 ChannelStrategy::FIXED, 50 ChannelStrategy::FIXED,
49 false, // Does not support system-level installs. 51 false, // Does not support system-level installs.
50 false, // Did not support multi-install. 52 false, // Did not support multi-install.
53 IDR_SXS,
51 }, 54 },
52 // clang-format on 55 // clang-format on
53 }; 56 };
54 57
55 static_assert(_countof(kInstallModes) == NUM_INSTALL_MODES, 58 static_assert(_countof(kInstallModes) == NUM_INSTALL_MODES,
56 "Imbalance between kInstallModes and InstallConstantIndex"); 59 "Imbalance between kInstallModes and InstallConstantIndex");
57 60
58 } // namespace install_static 61 } // namespace install_static
OLDNEW
« no previous file with comments | « chrome/install_static/chromium_install_modes.cc ('k') | chrome/install_static/install_constants.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698