Commit 17b65e3d authored by tommycli's avatar tommycli Committed by Commit bot

[HBD] Update MD Site Settings Plugin section to show Flash title

Also updates the route from /siteSettings/plugins to /siteSettings/flash

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

Review-Url: https://codereview.chromium.org/2296983002
Cr-Commit-Position: refs/heads/master@{#415650}
parent 540218bb
......@@ -1500,8 +1500,8 @@
<message name="IDS_SETTINGS_SITE_SETTINGS_JAVASCRIPT" desc="Label for the javascript site settings.">
Javascript
</message>
<message name="IDS_SETTINGS_SITE_SETTINGS_PLUGINS" desc="Label for the plugins site settings.">
Plugins
<message name="IDS_SETTINGS_SITE_SETTINGS_FLASH" desc="Label for the Flash site settings.">
Flash
</message>
<message name="IDS_SETTINGS_SITE_SETTINGS_POPUPS" desc="Label for the popups site settings.">
Popups
......
......@@ -263,8 +263,8 @@
</site-settings-category>
</settings-subpage>
</template>
<template is="dom-if" route-path="/siteSettings/plugins" no-search>
<settings-subpage page-title="$i18n{siteSettingsPlugins}">
<template is="dom-if" route-path="/siteSettings/flash" no-search>
<settings-subpage page-title="$i18n{siteSettingsFlash}">
<site-settings-category
selected-site="{{selectedSite}}"
category="{{ContentSettingsTypes.PLUGINS}}">
......
......@@ -153,7 +153,7 @@ cr.define('settings', function() {
r.SITE_SETTINGS_LOCATION = r.SITE_SETTINGS.createChild('location');
r.SITE_SETTINGS_MICROPHONE = r.SITE_SETTINGS.createChild('microphone');
r.SITE_SETTINGS_NOTIFICATIONS = r.SITE_SETTINGS.createChild('notifications');
r.SITE_SETTINGS_PLUGINS = r.SITE_SETTINGS.createChild('plugins');
r.SITE_SETTINGS_FLASH = r.SITE_SETTINGS.createChild('flash');
r.SITE_SETTINGS_POPUPS = r.SITE_SETTINGS.createChild('popups');
r.SITE_SETTINGS_UNSANDBOXED_PLUGINS =
r.SITE_SETTINGS.createChild('unsandboxedPlugins');
......
......@@ -136,7 +136,7 @@ var SiteSettingsBehaviorImpl = {
case settings.ContentSettingsTypes.NOTIFICATIONS:
return settings.Route.SITE_SETTINGS_NOTIFICATIONS;
case settings.ContentSettingsTypes.PLUGINS:
return settings.Route.SITE_SETTINGS_PLUGINS;
return settings.Route.SITE_SETTINGS_FLASH;
case settings.ContentSettingsTypes.POPUPS:
return settings.Route.SITE_SETTINGS_POPUPS;
case settings.ContentSettingsTypes.PROTOCOL_HANDLERS:
......@@ -230,7 +230,7 @@ var SiteSettingsBehaviorImpl = {
case settings.ContentSettingsTypes.NOTIFICATIONS:
return loadTimeData.getString('siteSettingsNotifications');
case settings.ContentSettingsTypes.PLUGINS:
return loadTimeData.getString('siteSettingsPlugins');
return loadTimeData.getString('siteSettingsFlash');
case settings.ContentSettingsTypes.POPUPS:
return loadTimeData.getString('siteSettingsPopups');
case settings.ContentSettingsTypes.PROTOCOL_HANDLERS:
......
......@@ -1256,7 +1256,7 @@ void AddSiteSettingsStrings(content::WebUIDataSource* html_source) {
{"siteSettingsNotifications", IDS_SETTINGS_SITE_SETTINGS_NOTIFICATIONS},
{"siteSettingsImages", IDS_SETTINGS_SITE_SETTINGS_IMAGES},
{"siteSettingsJavascript", IDS_SETTINGS_SITE_SETTINGS_JAVASCRIPT},
{"siteSettingsPlugins", IDS_SETTINGS_SITE_SETTINGS_PLUGINS},
{"siteSettingsFlash", IDS_SETTINGS_SITE_SETTINGS_FLASH},
{"siteSettingsPopups", IDS_SETTINGS_SITE_SETTINGS_POPUPS},
{"siteSettingsUnsandboxedPlugins",
IDS_SETTINGS_SITE_SETTINGS_UNSANDBOXED_PLUGINS},
......
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