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

Unified Diff: chrome/installer/setup/install.cc

Issue 2459583002: Use InstallDetails in setup. (Closed)
Patch Set: Created 4 years, 1 month 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/setup/install.cc
diff --git a/chrome/installer/setup/install.cc b/chrome/installer/setup/install.cc
index 5ab14e2cde784f09ffb94d5659ac082c31c6aff6..614da52e2fc90db2a6c4c41b66e5ef4625fcf987 100644
--- a/chrome/installer/setup/install.cc
+++ b/chrome/installer/setup/install.cc
@@ -24,6 +24,7 @@
#include "base/win/windows_version.h"
#include "chrome/common/chrome_constants.h"
#include "chrome/common/chrome_switches.h"
+#include "chrome/installer/setup/brand_constants.h"
#include "chrome/installer/setup/install_worker.h"
#include "chrome/installer/setup/installer_crash_reporting.h"
#include "chrome/installer/setup/setup_constants.h"
@@ -319,11 +320,10 @@ bool CreateVisualElementsManifest(const base::FilePath& src_path,
EscapeXmlAttributeValueInSingleQuotes(&display_name);
// Fill the manifest with the desired values.
- const base::char16* canary_str =
- InstallUtil::IsChromeSxSProcess() ? L"Canary" : L"";
+ const base::char16* logo_suffix = GetBrandConstants().logo_suffix;
base::string16 manifest16(base::StringPrintf(
- manifest_template.c_str(), elements_dir.c_str(), canary_str,
- elements_dir.c_str(), canary_str, elements_dir.c_str(), canary_str));
+ manifest_template.c_str(), elements_dir.c_str(), logo_suffix,
+ elements_dir.c_str(), logo_suffix, elements_dir.c_str(), logo_suffix));
// Write the manifest to |src_path|.
const std::string manifest(base::UTF16ToUTF8(manifest16));

Powered by Google App Engine
This is Rietveld 408576698