Commit d14410d0 authored by finnur's avatar finnur Committed by Commit bot

Site Settings Desktop: Convert cookie controls to distributed node.

BUG=614277, 543635
CQ_INCLUDE_TRYBOTS=tryserver.chromium.linux:closure_compilation

Review-Url: https://codereview.chromium.org/2082663003
Cr-Commit-Position: refs/heads/master@{#400701}
parent 6acf5977
...@@ -157,10 +157,16 @@ ...@@ -157,10 +157,16 @@
<template is="dom-if" name="site-settings-category-cookies"> <template is="dom-if" name="site-settings-category-cookies">
<settings-subpage page-title="$i18n{siteSettingsCategoryCookies}"> <settings-subpage page-title="$i18n{siteSettingsCategoryCookies}">
<site-settings-category <site-settings-category
prefs="{{prefs}}"
selected-site="{{selectedSite}}" selected-site="{{selectedSite}}"
current-route="{{currentRoute}}" current-route="{{currentRoute}}"
category="{{ContentSettingsTypes.COOKIES}}"> category="{{ContentSettingsTypes.COOKIES}}">
<div class="settings-box cookie-controls">
<settings-checkbox class="start"
label="$i18n{thirdPartyCookie}"
sub-label="$i18n{thirdPartyCookieSublabel}"
pref="{{prefs.profile.block_third_party_cookies}}">
</settings-checkbox>
</div>
</site-settings-category> </site-settings-category>
</settings-subpage> </settings-subpage>
</template> </template>
......
...@@ -47,15 +47,7 @@ ...@@ -47,15 +47,7 @@
on-change="onToggleChange_"></paper-toggle-button> on-change="onToggleChange_"></paper-toggle-button>
</div> </div>
<div id="cookieControls" hidden> <content select=".cookie-controls"></content>
<div class="settings-box">
<settings-checkbox class="start"
label="$i18n{thirdPartyCookie}"
sub-label="$i18n{thirdPartyCookieSublabel}"
pref="{{prefs.profile.block_third_party_cookies}}">
</settings-checkbox>
</div>
</div>
<settings-site-list <settings-site-list
category="[[category]]" category="[[category]]"
......
...@@ -21,14 +21,6 @@ Polymer({ ...@@ -21,14 +21,6 @@ Polymer({
notify: true, notify: true,
}, },
/**
* Preferences state.
*/
prefs: {
type: Object,
notify: true,
},
/** /**
* Represents the state of the main toggle shown for the category. For * Represents the state of the main toggle shown for the category. For
* example, the Location category can be set to Block/Ask so false, in that * example, the Location category can be set to Block/Ask so false, in that
...@@ -61,9 +53,6 @@ Polymer({ ...@@ -61,9 +53,6 @@ Polymer({
ready: function() { ready: function() {
this.addWebUIListener('contentSettingCategoryChanged', this.addWebUIListener('contentSettingCategoryChanged',
this.defaultValueForCategoryChanged_.bind(this)); this.defaultValueForCategoryChanged_.bind(this));
if (this.category == settings.ContentSettingsTypes.COOKIES)
this.$.cookieControls.hidden = false;
}, },
/** /**
......
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