Commit fa492598 authored by stevenjb's avatar stevenjb Committed by Commit bot

MD Settings: About: Fixes to channel switcher dialog

BUG=666876
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:closure_compilation

Review-Url: https://codereview.chromium.org/2563143002
Cr-Commit-Position: refs/heads/master@{#438038}
parent 5749f7cb
...@@ -86,6 +86,15 @@ ...@@ -86,6 +86,15 @@
<message name="IDS_SETTINGS_ABOUT_PAGE_UNSTABLE_WARNING_TITLE" desc="The title of the warning about switching to developer (unstable) channel."> <message name="IDS_SETTINGS_ABOUT_PAGE_UNSTABLE_WARNING_TITLE" desc="The title of the warning about switching to developer (unstable) channel.">
Warning: you are switching to developer channel Warning: you are switching to developer channel
</message> </message>
<message name="IDS_SETTINGS_ABOUT_PAGE_DIALOG_CHANNEL_STABLE" desc="The stable option in the channel select.">
Stable
</message>
<message name="IDS_SETTINGS_ABOUT_PAGE_DIALOG_CHANNEL_BETA" desc="The beta option in the channel select.">
Beta
</message>
<message name="IDS_SETTINGS_ABOUT_PAGE_DIALOG_CHANNEL_DEV" desc="The development option in the channel select.">
Developer - unstable
</message>
</if> </if>
<if expr="not chromeos"> <if expr="not chromeos">
<message name="IDS_SETTINGS_ABOUT_PAGE_RELAUNCH" desc="The label for the relaunch button that relaunches the browser once update is complete"> <message name="IDS_SETTINGS_ABOUT_PAGE_RELAUNCH" desc="The label for the relaunch button that relaunches the browser once update is complete">
......
...@@ -9,7 +9,11 @@ ...@@ -9,7 +9,11 @@
<dom-module id="settings-channel-switcher-dialog"> <dom-module id="settings-channel-switcher-dialog">
<template> <template>
<style include="settings-shared"></style> <style include="settings-shared">
dialog {
width: 600px;
}
</style>
<dialog is="cr-dialog" id="dialog"> <dialog is="cr-dialog" id="dialog">
<div class="title">$i18n{aboutChangeChannel}</div> <div class="title">$i18n{aboutChangeChannel}</div>
<div class="body"> <div class="body">
...@@ -19,13 +23,13 @@ ...@@ -19,13 +23,13 @@
<paper-radio-group <paper-radio-group
on-paper-radio-group-changed="onChannelSelectionChanged_"> on-paper-radio-group-changed="onChannelSelectionChanged_">
<paper-radio-button name="[[browserChannelEnum_.STABLE]]"> <paper-radio-button name="[[browserChannelEnum_.STABLE]]">
$i18n{aboutChannelStable} $i18n{aboutChannelDialogStable}
</paper-radio-button> </paper-radio-button>
<paper-radio-button name="[[browserChannelEnum_.BETA]]"> <paper-radio-button name="[[browserChannelEnum_.BETA]]">
$i18n{aboutChannelBeta} $i18n{aboutChannelDialogBeta}
</paper-radio-button> </paper-radio-button>
<paper-radio-button name="[[browserChannelEnum_.DEV]]"> <paper-radio-button name="[[browserChannelEnum_.DEV]]">
$i18n{aboutChannelDev} $i18n{aboutChannelDialogDev}
</paper-radio-button> </paper-radio-button>
</paper-radio-group> </paper-radio-group>
<div id="warning" hidden="[[!shouldShowWarning_(warning_)]]"> <div id="warning" hidden="[[!shouldShowWarning_(warning_)]]">
......
...@@ -237,6 +237,9 @@ void AddAboutStrings(content::WebUIDataSource* html_source) { ...@@ -237,6 +237,9 @@ void AddAboutStrings(content::WebUIDataSource* html_source) {
IDS_SETTINGS_ABOUT_PAGE_UNSTABLE_WARNING_MESSAGE}, IDS_SETTINGS_ABOUT_PAGE_UNSTABLE_WARNING_MESSAGE},
{"aboutUnstableWarningTitle", {"aboutUnstableWarningTitle",
IDS_SETTINGS_ABOUT_PAGE_UNSTABLE_WARNING_TITLE}, IDS_SETTINGS_ABOUT_PAGE_UNSTABLE_WARNING_TITLE},
{"aboutChannelDialogBeta", IDS_SETTINGS_ABOUT_PAGE_DIALOG_CHANNEL_BETA},
{"aboutChannelDialogDev", IDS_SETTINGS_ABOUT_PAGE_DIALOG_CHANNEL_DEV},
{"aboutChannelDialogStable", IDS_SETTINGS_ABOUT_PAGE_DIALOG_CHANNEL_STABLE},
#endif #endif
}; };
AddLocalizedStringsBulk(html_source, localized_strings, AddLocalizedStringsBulk(html_source, localized_strings,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment