diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-07-17 13:57:45 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-07-19 13:44:40 +0000 |
| commit | 6ec7b8da05d21a3878bd21c691b41e675d74bb1c (patch) | |
| tree | b87f250bc19413750b9bb9cdbf2da20ef5014820 /chromium/chrome/browser/resources/settings/site_settings/add_site_dialog.js | |
| parent | ec02ee4181c49b61fce1c8fb99292dbb8139cc90 (diff) | |
BASELINE: Update Chromium to 60.0.3112.70
Change-Id: I9911c2280a014d4632f254857876a395d4baed2d
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/chrome/browser/resources/settings/site_settings/add_site_dialog.js')
| -rw-r--r-- | chromium/chrome/browser/resources/settings/site_settings/add_site_dialog.js | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/chromium/chrome/browser/resources/settings/site_settings/add_site_dialog.js b/chromium/chrome/browser/resources/settings/site_settings/add_site_dialog.js index 41eecca19c8..91ceb616f6f 100644 --- a/chromium/chrome/browser/resources/settings/site_settings/add_site_dialog.js +++ b/chromium/chrome/browser/resources/settings/site_settings/add_site_dialog.js @@ -41,14 +41,12 @@ Polymer({ assert(this.contentSetting); }, - /** - * Opens the dialog. - * @param {string} type Whether this was launched from an Allow list or a - * Block list. - */ - open: function(type) { - this.addWebUIListener('onIncognitoStatusChanged', function(isActive) { - this.showIncognitoSessionOnly_ = isActive && + /** Open the dialog. */ + open: function() { + this.addWebUIListener('onIncognitoStatusChanged', function(hasIncognito) { + this.$.incognito.checked = false; + this.showIncognitoSessionOnly_ = hasIncognito && + !loadTimeData.getBoolean('isGuest') && this.contentSetting != settings.PermissionValues.SESSION_ONLY; }.bind(this)); this.browserProxy.updateIncognitoStatus(); |