Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(28)

Side by Side Diff: chrome/browser/resources/settings/site_settings/site_settings_behavior.js

Issue 2316633002: Site Settings Desktop: Implement tri-state 'Delete local data on exit'. (Closed)
Patch Set: Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 /** 5 /**
6 * @fileoverview Behavior common to Site Settings classes. 6 * @fileoverview Behavior common to Site Settings classes.
7 */ 7 */
8 8
9 /** @polymerBehavior */ 9 /** @polymerBehavior */
10 var SiteSettingsBehaviorImpl = { 10 var SiteSettingsBehaviorImpl = {
(...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after
255 case settings.ContentSettingsTypes.MIC: 255 case settings.ContentSettingsTypes.MIC:
256 // "Ask before accessing (recommended)" vs "Blocked". 256 // "Ask before accessing (recommended)" vs "Blocked".
257 if (!categoryEnabled) { 257 if (!categoryEnabled) {
258 return loadTimeData.getString('siteSettingsBlocked'); 258 return loadTimeData.getString('siteSettingsBlocked');
259 } 259 }
260 return showRecommendation ? 260 return showRecommendation ?
261 loadTimeData.getString( 261 loadTimeData.getString(
262 'siteSettingsAskBeforeAccessingRecommended') : 262 'siteSettingsAskBeforeAccessingRecommended') :
263 loadTimeData.getString('siteSettingsAskBeforeAccessing'); 263 loadTimeData.getString('siteSettingsAskBeforeAccessing');
264 case settings.ContentSettingsTypes.COOKIES: 264 case settings.ContentSettingsTypes.COOKIES:
265 // "Allow sites to save and read cookie data" vs "Blocked". 265 // Tri-state: "Allow sites to save and read cookie data" vs "Blocked"
266 if (!categoryEnabled) { 266 // vs "Keep local data only until you quit your browser".
dschuyler 2016/09/06 18:36:43 It looks like there is four states. Blocked and Al
Finnur 2016/09/08 09:59:39 I don't quite understand... There are three states
267 if (setting == settings.PermissionValues.BLOCK)
267 return loadTimeData.getString('siteSettingsBlocked'); 268 return loadTimeData.getString('siteSettingsBlocked');
268 } 269 if (setting == settings.PermissionValues.SESSION_ONLY)
270 return loadTimeData.getString('deleteDataPostSession');
269 return showRecommendation ? 271 return showRecommendation ?
270 loadTimeData.getString('siteSettingsCookiesAllowedRecommended') : 272 loadTimeData.getString('siteSettingsCookiesAllowedRecommended') :
271 loadTimeData.getString('siteSettingsCookiesAllowed'); 273 loadTimeData.getString('siteSettingsCookiesAllowed');
272 case settings.ContentSettingsTypes.PROTOCOL_HANDLERS: 274 case settings.ContentSettingsTypes.PROTOCOL_HANDLERS:
273 // "Allow sites to ask to become default handlers" vs "Blocked". 275 // "Allow sites to ask to become default handlers" vs "Blocked".
274 if (!categoryEnabled) { 276 if (!categoryEnabled) {
275 return loadTimeData.getString('siteSettingsHandlersBlocked'); 277 return loadTimeData.getString('siteSettingsHandlersBlocked');
276 } 278 }
277 return showRecommendation ? 279 return showRecommendation ?
278 loadTimeData.getString('siteSettingsHandlersAskRecommended') : 280 loadTimeData.getString('siteSettingsHandlersAskRecommended') :
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
426 computeIsSettingEnabled: function(category, setting) { 428 computeIsSettingEnabled: function(category, setting) {
427 // FullScreen is Allow vs. Ask. 429 // FullScreen is Allow vs. Ask.
428 return category == settings.ContentSettingsTypes.FULLSCREEN ? 430 return category == settings.ContentSettingsTypes.FULLSCREEN ?
429 setting != settings.PermissionValues.ASK : 431 setting != settings.PermissionValues.ASK :
430 setting != settings.PermissionValues.BLOCK; 432 setting != settings.PermissionValues.BLOCK;
431 }, 433 },
432 }; 434 };
433 435
434 /** @polymerBehavior */ 436 /** @polymerBehavior */
435 var SiteSettingsBehavior = [SiteSettingsBehaviorImpl]; 437 var SiteSettingsBehavior = [SiteSettingsBehaviorImpl];
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698