| Index: chrome/installer/setup/install.cc
|
| diff --git a/chrome/installer/setup/install.cc b/chrome/installer/setup/install.cc
|
| index 63632889430b8741b8e0f6052daa83e2f059bdba..a4068bbaebd49f2f76cd790da61a2271e0ded753 100644
|
| --- a/chrome/installer/setup/install.cc
|
| +++ b/chrome/installer/setup/install.cc
|
| @@ -21,6 +21,7 @@
|
| #include "base/strings/stringprintf.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| #include "base/win/shortcut.h"
|
| +#include "chrome/install_static/install_details.h"
|
| #include "chrome/installer/setup/install_worker.h"
|
| #include "chrome/installer/setup/installer_crash_reporting.h"
|
| #include "chrome/installer/setup/installer_state.h"
|
| @@ -308,11 +309,11 @@ 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 =
|
| + install_static::InstallDetails::Get().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));
|
|
|