Commit 8444fc2d authored by Sidney San Martín's avatar Sidney San Martín Committed by Commit Bot

[Mac] Add Warn Before Quitting to Settings. It's still in the Chrome menu, too.

Bug: 900293
Change-Id: I86b7bab7ce9fb2f332f44f7a825544b7ca4eddd3
Reviewed-on: https://chromium-review.googlesource.com/c/1308760Reviewed-by: default avatarAvi Drissman <avi@chromium.org>
Commit-Queue: Sidney San Martín <sdy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#604127}
parent c88fa75b
...@@ -576,6 +576,9 @@ ...@@ -576,6 +576,9 @@
<message name="IDS_SETTINGS_TABS_TO_LINKS_PREF" desc="The documentation string of the 'Tabs to Links' preference"> <message name="IDS_SETTINGS_TABS_TO_LINKS_PREF" desc="The documentation string of the 'Tabs to Links' preference">
Pressing Tab on a webpage highlights links, as well as form fields Pressing Tab on a webpage highlights links, as well as form fields
</message> </message>
<message name="IDS_SETTINGS_WARN_BEFORE_QUITTING_PREF" desc="The documentation string of the 'Warn Before Quitting' preference which is also available in the Chrome app menu.">
Show a warning before quitting with ⌘Q
</message>
</if> </if>
<!-- Common --> <!-- Common -->
......
...@@ -163,6 +163,8 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetWhitelistedKeys() { ...@@ -163,6 +163,8 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetWhitelistedKeys() {
#if defined(OS_MACOSX) #if defined(OS_MACOSX)
(*s_whitelist)[::prefs::kWebkitTabsToLinks] = (*s_whitelist)[::prefs::kWebkitTabsToLinks] =
settings_api::PrefType::PREF_TYPE_BOOLEAN; settings_api::PrefType::PREF_TYPE_BOOLEAN;
(*s_whitelist)[::prefs::kConfirmToQuitEnabled] =
settings_api::PrefType::PREF_TYPE_BOOLEAN;
#endif #endif
// On startup. // On startup.
......
...@@ -179,6 +179,9 @@ ...@@ -179,6 +179,9 @@
<settings-toggle-button pref="{{prefs.webkit.webprefs.tabs_to_links}}" <settings-toggle-button pref="{{prefs.webkit.webprefs.tabs_to_links}}"
label="$i18n{tabsToLinks}"> label="$i18n{tabsToLinks}">
</settings-toggle-button> </settings-toggle-button>
<settings-toggle-button pref="{{prefs.browser.confirm_to_quit}}"
label="$i18n{warnBeforeQuitting}">
</settings-toggle-button>
</if> </if>
</neon-animatable> </neon-animatable>
<template is="dom-if" route-path="/fonts"> <template is="dom-if" route-path="/fonts">
......
...@@ -489,6 +489,7 @@ void AddAppearanceStrings(content::WebUIDataSource* html_source, ...@@ -489,6 +489,7 @@ void AddAppearanceStrings(content::WebUIDataSource* html_source,
#endif #endif
#if defined(OS_MACOSX) #if defined(OS_MACOSX)
{"tabsToLinks", IDS_SETTINGS_TABS_TO_LINKS_PREF}, {"tabsToLinks", IDS_SETTINGS_TABS_TO_LINKS_PREF},
{"warnBeforeQuitting", IDS_SETTINGS_WARN_BEFORE_QUITTING_PREF},
#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