|
@@ -7,6 +7,7 @@
|
|
|
# link to Google's accessibility site from the settings page
|
|
|
# link to Google's help site on the About page
|
|
|
# external link for theme entry on settings page
|
|
|
+# webstore text for theme entry on settings page
|
|
|
# Check passwords and managed passwords sections from the passwords page
|
|
|
# the Google account line from the Payment methods page
|
|
|
# Safety check section on the settings page
|
|
@@ -130,6 +131,31 @@
|
|
|
<if expr="not is_linux">
|
|
|
<template is="dom-if" if="[[prefs.extensions.theme.id.value]]">
|
|
|
<div class="separator"></div>
|
|
|
+--- a/chrome/browser/resources/settings/appearance_page/appearance_page.ts
|
|
|
++++ b/chrome/browser/resources/settings/appearance_page/appearance_page.ts
|
|
|
+@@ -353,8 +353,8 @@ export class SettingsAppearancePageEleme
|
|
|
+ return;
|
|
|
+ }
|
|
|
+
|
|
|
+- let i18nId;
|
|
|
+ // <if expr="is_linux">
|
|
|
++ let i18nId;
|
|
|
+ switch (this.systemTheme_) {
|
|
|
+ case SystemTheme.GTK:
|
|
|
+ i18nId = 'gtkTheme';
|
|
|
+@@ -366,11 +366,8 @@ export class SettingsAppearancePageEleme
|
|
|
+ i18nId = 'classicTheme';
|
|
|
+ break;
|
|
|
+ }
|
|
|
+- // </if>
|
|
|
+- // <if expr="not is_linux">
|
|
|
+- i18nId = 'chooseFromWebStore';
|
|
|
+- // </if>
|
|
|
+ this.themeSublabel_ = this.i18n(i18nId);
|
|
|
++ // </if>
|
|
|
+ }
|
|
|
+
|
|
|
+ /** @return Whether applied theme is set by policy. */
|
|
|
--- a/chrome/browser/resources/settings/autofill_page/passwords_section.html
|
|
|
+++ b/chrome/browser/resources/settings/autofill_page/passwords_section.html
|
|
|
@@ -125,6 +125,7 @@
|