diff options
Diffstat (limited to 'chrome/browser/resources/settings')
4 files changed, 14 insertions, 6 deletions
diff --git a/chrome/browser/resources/settings/a11y_page/a11y_page.html b/chrome/browser/resources/settings/a11y_page/a11y_page.html index b8e37d1..25ae86f 100644 --- a/chrome/browser/resources/settings/a11y_page/a11y_page.html +++ b/chrome/browser/resources/settings/a11y_page/a11y_page.html @@ -1,11 +1,14 @@ <link rel="import" href="chrome://resources/html/polymer.html"> <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-button.html"> +<if expr="chromeos"> <link rel="import" href="chrome://md-settings/controls/settings_checkbox.html"> +</if> <link rel="import" href="chrome://md-settings/settings_shared_css.html"> <dom-module id="settings-a11y-page"> <template> <style include="settings-shared"></style> +<if expr="chromeos"> <div class="settings-box row first"> <span i18n-content="a11yExplanation"></span> <a i18n-values="href:a11yLearnMoreUrl" i18n-content="learnMore" @@ -76,10 +79,16 @@ </settings-checkbox> </template> </div> +</if> +<if expr="chromeos"> <div class="settings-box"> +</if> +<if expr="not chromeos"> + <div class="settings-box first"> +</if> <div class="button-strip"> - <paper-button i18n-content="moreFeaturesLink" + <paper-button i18n-content="moreFeaturesLink" class="primary-button" on-tap="onMoreFeaturesTap_"></paper-button> </div> </div> diff --git a/chrome/browser/resources/settings/a11y_page/a11y_page.js b/chrome/browser/resources/settings/a11y_page/a11y_page.js index 109c99e..0c56580 100644 --- a/chrome/browser/resources/settings/a11y_page/a11y_page.js +++ b/chrome/browser/resources/settings/a11y_page/a11y_page.js @@ -26,6 +26,7 @@ Polymer({ notify: true, }, +<if expr="chromeos"> /** * Whether to show experimental accessibility features. * @private {boolean} @@ -36,6 +37,7 @@ Polymer({ return loadTimeData.getBoolean('showExperimentalA11yFeatures'); }, } +</if> }, /** @private */ diff --git a/chrome/browser/resources/settings/advanced_page/advanced_page.html b/chrome/browser/resources/settings/advanced_page/advanced_page.html index 406f1bf..91b063f 100644 --- a/chrome/browser/resources/settings/advanced_page/advanced_page.html +++ b/chrome/browser/resources/settings/advanced_page/advanced_page.html @@ -1,5 +1,6 @@ <link rel="import" href="chrome://resources/html/i18n_behavior.html"> <link rel="import" href="chrome://resources/html/polymer.html"> +<link rel="import" href="chrome://md-settings/a11y_page/a11y_page.html"> <link rel="import" href="chrome://md-settings/downloads_page/downloads_page.html"> <link rel="import" href="chrome://md-settings/languages_page/languages_page.html"> <link rel="import" href="chrome://md-settings/passwords_and_forms_page/passwords_and_forms_page.html"> @@ -12,7 +13,6 @@ <link rel="import" href="chrome://md-settings/site_settings/site_settings_category.html"> <if expr="chromeos"> -<link rel="import" href="chrome://md-settings/a11y_page/a11y_page.html"> <link rel="import" href="chrome://md-settings/bluetooth_page/bluetooth_page.html"> <link rel="import" href="chrome://md-settings/date_time_page/date_time_page.html"> </if> @@ -79,16 +79,12 @@ <!-- TODO(dschuyler): Add Google Cloud Print section here. --> -<if expr="chromeos"> - <!-- TODO(dbeam): find somewhere to stuff "Add more accessibility features" - on desktop. --> <template is="dom-if" if="[[showPage(pageVisibility.a11y)]]" restamp> <settings-section page-title="[[i18n('a11yPageTitle')]]" current-route="[[currentRoute]]" section="a11y"> <settings-a11y-page prefs="{{prefs}}"></settings-a11y-page> </settings-section> </template> -</if> <if expr="not chromeos"> <template is="dom-if" if="[[showPage(pageVisibility.system)]]" restamp> <settings-section page-title="[[i18n('systemPageTitle')]]" diff --git a/chrome/browser/resources/settings/settings_resources.grd b/chrome/browser/resources/settings/settings_resources.grd index c0eba2d..4cf76ed 100644 --- a/chrome/browser/resources/settings/settings_resources.grd +++ b/chrome/browser/resources/settings/settings_resources.grd @@ -14,6 +14,7 @@ <structures> <structure name="IDR_SETTINGS_A11Y_PAGE_JS" file="a11y_page/a11y_page.js" + flattenhtml="true" type="chrome_html" /> <structure name="IDR_SETTINGS_A11Y_PAGE_HTML" file="a11y_page/a11y_page.html" |