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

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

Issue 2933343003: Settings: Cookies: Avoid duplicate 'incognito' exceptions in CrOS Guest mode (Closed)
Patch Set: Created 3 years, 6 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
« no previous file with comments | « no previous file | chrome/browser/ui/webui/settings/site_settings_handler.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 6 * @fileoverview
7 * 'add-site-dialog' provides a dialog to add exceptions for a given Content 7 * 'add-site-dialog' provides a dialog to add exceptions for a given Content
8 * Settings category. 8 * Settings category.
9 */ 9 */
10 Polymer({ 10 Polymer({
(...skipping 28 matching lines...) Expand all
39 attached: function() { 39 attached: function() {
40 assert(this.category); 40 assert(this.category);
41 assert(this.contentSetting); 41 assert(this.contentSetting);
42 }, 42 },
43 43
44 /** Open the dialog. */ 44 /** Open the dialog. */
45 open: function() { 45 open: function() {
46 this.addWebUIListener('onIncognitoStatusChanged', function(hasIncognito) { 46 this.addWebUIListener('onIncognitoStatusChanged', function(hasIncognito) {
47 this.$.incognito.checked = false; 47 this.$.incognito.checked = false;
48 this.showIncognitoSessionOnly_ = hasIncognito && 48 this.showIncognitoSessionOnly_ = hasIncognito &&
49 !loadTimeData.getBoolean('isGuest') &&
49 this.contentSetting != settings.PermissionValues.SESSION_ONLY; 50 this.contentSetting != settings.PermissionValues.SESSION_ONLY;
50 }.bind(this)); 51 }.bind(this));
51 this.browserProxy.updateIncognitoStatus(); 52 this.browserProxy.updateIncognitoStatus();
52 this.$.dialog.showModal(); 53 this.$.dialog.showModal();
53 }, 54 },
54 55
55 /** 56 /**
56 * Validates that the pattern entered is valid. 57 * Validates that the pattern entered is valid.
57 * @private 58 * @private
58 */ 59 */
(...skipping 24 matching lines...) Expand all
83 */ 84 */
84 onSubmit_: function() { 85 onSubmit_: function() {
85 if (this.$.add.disabled) 86 if (this.$.add.disabled)
86 return; // Can happen when Enter is pressed. 87 return; // Can happen when Enter is pressed.
87 this.browserProxy.setCategoryPermissionForOrigin( 88 this.browserProxy.setCategoryPermissionForOrigin(
88 this.site_, this.site_, this.category, this.contentSetting, 89 this.site_, this.site_, this.category, this.contentSetting,
89 this.$.incognito.checked); 90 this.$.incognito.checked);
90 this.$.dialog.close(); 91 this.$.dialog.close();
91 }, 92 },
92 }); 93 });
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/webui/settings/site_settings_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698