Commit f57c8e06 authored by Sean Harrison's avatar Sean Harrison Committed by Commit Bot

Add site specific exceptions to cookies page

Bug: 1032584
Change-Id: Iede0e4630357ae5e4ccb653e7925a8beb808f20d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2002616
Commit-Queue: Sean Harrison <harrisonsean@chromium.org>
Reviewed-by: default avatardpapad <dpapad@chromium.org>
Cr-Commit-Position: refs/heads/master@{#746654}
parent d85527d7
...@@ -1913,6 +1913,9 @@ ...@@ -1913,6 +1913,9 @@
<message name="IDS_SETTINGS_COOKIES_PAGE" desc="Title of the cookies settings page"> <message name="IDS_SETTINGS_COOKIES_PAGE" desc="Title of the cookies settings page">
Cookies Cookies
</message> </message>
<message name="IDS_SETTINGS_COOKIES_SITE_SPECIFIC_EXCEPTIONS" desc="Title of cookies page section for managing site specific cookie settings">
Manage site specific exceptions
</message>
<message name="IDS_SETTINGS_SITE_SETTINGS_COOKIES" desc="Label for the cookies and site data site settings."> <message name="IDS_SETTINGS_SITE_SETTINGS_COOKIES" desc="Label for the cookies and site data site settings.">
Cookies and site data Cookies and site data
</message> </message>
......
...@@ -23,7 +23,10 @@ js_type_check("closure_compile") { ...@@ -23,7 +23,10 @@ js_type_check("closure_compile") {
} }
js_library("cookies_page") { js_library("cookies_page") {
deps = [ "//ui/webui/resources/js:load_time_data" ] deps = [
"../site_settings:constants",
"//ui/webui/resources/js:load_time_data",
]
} }
js_library("personalization_options") { js_library("personalization_options") {
......
<link rel="import" href="chrome://resources/html/polymer.html"> <link rel="import" href="chrome://resources/html/polymer.html">
<link rel="import" href="../settings_shared_css.html">
<link rel="import" href="../site_settings/category_setting_exceptions.html">
<link rel="import" href="../site_settings/constants.html">
<dom-module id="settings-cookies-page"> <dom-module id="settings-cookies-page">
<template> <template>
<style> <style include="settings-shared">
img { img {
width: 100%; width: 100%;
} }
</style> </style>
<img src="../images/cookies_banner.svg"> <img src="../images/cookies_banner.svg">
<div class="settings-box first">
<h2>$i18n{cookiesManageSiteSpecificExceptions}</h2>
</div>
<category-setting-exceptions
category="[[ContentSettingsTypes.COOKIES]]"
block-header="$i18n{siteSettingsBlock}">
</category-setting-exceptions>
</template> </template>
<script src="cookies_page.js"></script> <script src="cookies_page.js"></script>
</dom-module> </dom-module>
// Copyright 2019 The Chromium Authors. All rights reserved. // Copyright 2020 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
...@@ -7,9 +7,14 @@ ...@@ -7,9 +7,14 @@
* 'settings-cookies-page' is the settings page containing cookies * 'settings-cookies-page' is the settings page containing cookies
* settings. * settings.
*/ */
(function() {
Polymer({ Polymer({
is: 'settings-cookies-page', is: 'settings-cookies-page',
properties: {
/**
* @private {!settings.ContentSettingsTypes}
*/
ContentSettingsTypes: {type: Object, value: settings.ContentSettingsTypes},
},
}); });
})();
...@@ -1328,6 +1328,8 @@ void AddSiteSettingsStrings(content::WebUIDataSource* html_source, ...@@ -1328,6 +1328,8 @@ void AddSiteSettingsStrings(content::WebUIDataSource* html_source,
{"siteSettingsCategoryCamera", IDS_SETTINGS_SITE_SETTINGS_CAMERA}, {"siteSettingsCategoryCamera", IDS_SETTINGS_SITE_SETTINGS_CAMERA},
{"siteSettingsCameraLabel", IDS_SETTINGS_SITE_SETTINGS_CAMERA_LABEL}, {"siteSettingsCameraLabel", IDS_SETTINGS_SITE_SETTINGS_CAMERA_LABEL},
{"cookiePageTitle", IDS_SETTINGS_COOKIES_PAGE}, {"cookiePageTitle", IDS_SETTINGS_COOKIES_PAGE},
{"cookiesManageSiteSpecificExceptions",
IDS_SETTINGS_COOKIES_SITE_SPECIFIC_EXCEPTIONS},
{"siteSettingsCategoryCookies", IDS_SETTINGS_SITE_SETTINGS_COOKIES}, {"siteSettingsCategoryCookies", IDS_SETTINGS_SITE_SETTINGS_COOKIES},
{"siteSettingsCategoryHandlers", IDS_SETTINGS_SITE_SETTINGS_HANDLERS}, {"siteSettingsCategoryHandlers", IDS_SETTINGS_SITE_SETTINGS_HANDLERS},
{"siteSettingsCategoryImages", IDS_SETTINGS_SITE_SETTINGS_IMAGES}, {"siteSettingsCategoryImages", IDS_SETTINGS_SITE_SETTINGS_IMAGES},
......
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