| Index: chrome/browser/resources/settings/site_settings/site_settings_prefs_browser_proxy.js
|
| diff --git a/chrome/browser/resources/settings/site_settings/site_settings_prefs_browser_proxy.js b/chrome/browser/resources/settings/site_settings/site_settings_prefs_browser_proxy.js
|
| index 39a197dc654062baebe8caa22f982f035f3e8828..d3b9da62e02d4157532f5ae6b4d1e9696ffb687a 100644
|
| --- a/chrome/browser/resources/settings/site_settings/site_settings_prefs_browser_proxy.js
|
| +++ b/chrome/browser/resources/settings/site_settings/site_settings_prefs_browser_proxy.js
|
| @@ -9,6 +9,8 @@
|
|
|
| /**
|
| * @typedef {{embeddingOrigin: string,
|
| + * embeddingOriginForDisplay: string,
|
| + * incognito: boolean,
|
| * origin: string,
|
| * originForDisplay: string,
|
| * setting: string,
|
| @@ -97,9 +99,11 @@ cr.define('settings', function() {
|
| * @param {string} secondaryPattern The embedding origin to change
|
| * (secondary pattern).
|
| * @param {string} contentType The name of the category to reset.
|
| + * @param {boolean} incognito Whether this applies only to a current
|
| + * incognito session exception.
|
| */
|
| resetCategoryPermissionForOrigin: function(
|
| - primaryPattern, secondaryPattern, contentType) {},
|
| + primaryPattern, secondaryPattern, contentType, incognito) {},
|
|
|
| /**
|
| * Sets the category permission for a given origin (expressed as primary
|
| @@ -109,9 +113,11 @@ cr.define('settings', function() {
|
| * (secondary pattern).
|
| * @param {string} contentType The name of the category to change.
|
| * @param {string} value The value to change the permission to.
|
| + * @param {boolean} incognito Whether this rule applies only to the current
|
| + * incognito session.
|
| */
|
| setCategoryPermissionForOrigin: function(
|
| - primaryPattern, secondaryPattern, contentType, value) {},
|
| + primaryPattern, secondaryPattern, contentType, value, incognito) {},
|
|
|
| /**
|
| * Checks whether a pattern is valid.
|
| @@ -204,6 +210,12 @@ cr.define('settings', function() {
|
| * for.
|
| */
|
| removeUsbDevice: function(origin, embeddingOrigin, usbDevice) {},
|
| +
|
| + /**
|
| + * Fetches the incognito status of the current profile (whether an icognito
|
| + * profile exists). Returns the results via onIncognitoStatusChanged.
|
| + */
|
| + updateIncognitoStatus: function() {},
|
| };
|
|
|
| /**
|
| @@ -234,16 +246,16 @@ cr.define('settings', function() {
|
|
|
| /** @override */
|
| resetCategoryPermissionForOrigin: function(
|
| - primaryPattern, secondaryPattern, contentType) {
|
| + primaryPattern, secondaryPattern, contentType, incognito) {
|
| chrome.send('resetCategoryPermissionForOrigin',
|
| - [primaryPattern, secondaryPattern, contentType]);
|
| + [primaryPattern, secondaryPattern, contentType, incognito]);
|
| },
|
|
|
| /** @override */
|
| setCategoryPermissionForOrigin: function(
|
| - primaryPattern, secondaryPattern, contentType, value) {
|
| + primaryPattern, secondaryPattern, contentType, value, incognito) {
|
| chrome.send('setCategoryPermissionForOrigin',
|
| - [primaryPattern, secondaryPattern, contentType, value]);
|
| + [primaryPattern, secondaryPattern, contentType, value, incognito]);
|
| },
|
|
|
| /** @override */
|
| @@ -281,7 +293,6 @@ cr.define('settings', function() {
|
| return cr.sendWithPromise('removeAllCookies');
|
| },
|
|
|
| -
|
| initializeProtocolHandlerList: function() {
|
| chrome.send('initializeProtocolHandlerList');
|
| },
|
| @@ -310,6 +321,11 @@ cr.define('settings', function() {
|
| removeUsbDevice: function(origin, embeddingOrigin, usbDevice) {
|
| chrome.send('removeUsbDevice', [origin, embeddingOrigin, usbDevice]);
|
| },
|
| +
|
| + /** @override */
|
| + updateIncognitoStatus: function() {
|
| + chrome.send('updateIncognitoStatus');
|
| + },
|
| };
|
|
|
| return {
|
|
|