summaryrefslogtreecommitdiff
path: root/chromium/components/version_ui
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2020-10-29 10:46:47 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2020-11-02 12:02:10 +0000
commit99677208ff3b216fdfec551fbe548da5520cd6fb (patch)
tree476a4865c10320249360e859d8fdd3e01833b03a /chromium/components/version_ui
parentc30a6232df03e1efbd9f3b226777b07e087a1122 (diff)
downloadqtwebengine-chromium-99677208ff3b216fdfec551fbe548da5520cd6fb.tar.gz
BASELINE: Update Chromium to 86.0.4240.124
Change-Id: Ide0ff151e94cd665ae6521a446995d34a9d1d644 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/components/version_ui')
-rw-r--r--chromium/components/version_ui/resources/about_version.html6
-rw-r--r--chromium/components/version_ui/version_ui_constants.cc3
-rw-r--r--chromium/components/version_ui/version_ui_constants.h3
3 files changed, 7 insertions, 5 deletions
diff --git a/chromium/components/version_ui/resources/about_version.html b/chromium/components/version_ui/resources/about_version.html
index 03c63d40949..e300f4a2250 100644
--- a/chromium/components/version_ui/resources/about_version.html
+++ b/chromium/components/version_ui/resources/about_version.html
@@ -38,14 +38,14 @@ about:version template page
<picture>
<source srcset="chrome://theme/IDR_PRODUCT_LOGO_WHITE" media="(prefers-color-scheme: dark)">
<source srcset="chrome://theme/IDR_PRODUCT_LOGO" media="(prefers-color-scheme: light), (prefers-color-scheme: no-preference)">
- <img src="chrome://theme/IDR_PRODUCT_LOGO">
+ <img alt="$i18n{logo_alt_text}" src="chrome://theme/IDR_PRODUCT_LOGO">
</picture>
</if>
<if expr="is_ios or is_android">
<picture>
<source srcset="../../../components/resources/default_100_percent/%DISTRIBUTION%/product_logo_white.png" media="(prefers-color-scheme: dark)">
<source srcset="../../../components/resources/default_100_percent/%DISTRIBUTION%/product_logo.png" media="(prefers-color-scheme: light), (prefers-color-scheme: no-preference)">
- <img src="../../../components/resources/default_100_percent/%DISTRIBUTION%/product_logo.png">
+ <img alt="$i18n{logo_alt_text}" src="../../../components/resources/default_100_percent/%DISTRIBUTION%/product_logo.png">
</picture>
</if>
<div id="company">$i18n{company}</div>
@@ -57,7 +57,7 @@ about:version template page
<span>$i18n{version}</span>
(<span>$i18n{official}</span>)
<span>$i18n{version_modifier}</span>
- <span>$i18n{version_bitsize}</span>
+ <span>$i18n{version_processor_variation}</span>
<if expr="is_win">
<span>$i18n{update_cohort_name}</span>
</if>
diff --git a/chromium/components/version_ui/version_ui_constants.cc b/chromium/components/version_ui/version_ui_constants.cc
index 53e81e339eb..07518278edd 100644
--- a/chromium/components/version_ui/version_ui_constants.cc
+++ b/chromium/components/version_ui/version_ui_constants.cc
@@ -56,6 +56,7 @@ const char kFlashVersion[] = "flash_version";
const char kJSEngine[] = "js_engine";
const char kJSVersion[] = "js_version";
#endif
+const char kLogoAltText[] = "logo_alt_text";
const char kOfficial[] = "official";
#if !defined(OS_CHROMEOS)
const char kOSName[] = "os_name";
@@ -81,7 +82,7 @@ const char kUserAgentName[] = "user_agent_name";
const char kVariationsCmdName[] = "variations_cmd_name";
const char kVariationsName[] = "variations_name";
const char kVersion[] = "version";
-const char kVersionBitSize[] = "version_bitsize";
const char kVersionModifier[] = "version_modifier";
+const char kVersionProcessorVariation[] = "version_processor_variation";
} // namespace version_ui
diff --git a/chromium/components/version_ui/version_ui_constants.h b/chromium/components/version_ui/version_ui_constants.h
index ffd3334a9a7..a1b671179e9 100644
--- a/chromium/components/version_ui/version_ui_constants.h
+++ b/chromium/components/version_ui/version_ui_constants.h
@@ -61,6 +61,7 @@ extern const char kFlashVersion[];
extern const char kJSEngine[];
extern const char kJSVersion[];
#endif
+extern const char kLogoAltText[];
extern const char kOfficial[];
#if !defined(OS_CHROMEOS)
extern const char kOSName[];
@@ -86,8 +87,8 @@ extern const char kUserAgentName[];
extern const char kVariationsCmdName[];
extern const char kVariationsName[];
extern const char kVersion[];
-extern const char kVersionBitSize[];
extern const char kVersionModifier[];
+extern const char kVersionProcessorVariation[];
} // namespace version_ui