Chromium Code Reviews| Index: chrome/browser/resources/options2/content_settings.js |
| diff --git a/chrome/browser/resources/options2/content_settings.js b/chrome/browser/resources/options2/content_settings.js |
| index fec7940790806a441e9c7f27658db068762801c0..e0761a0fdb074dd252da1f7517adff3776a18cfd 100644 |
| --- a/chrome/browser/resources/options2/content_settings.js |
| +++ b/chrome/browser/resources/options2/content_settings.js |
| @@ -67,6 +67,19 @@ cr.define('options', function() { |
| }; |
| } |
| + var manageIntentsButton = $('manage-intents-button'); |
|
James Hawkins
2012/02/28 20:03:35
Not sure why you're adding this. The intents page
Denis Kuznetsov (DE-MUC)
2012/02/29 08:41:43
It is an artifact of manual merge.
Done.
|
| + if (manageIntentsButton) { |
| + manageIntentsButton.onclick = function(event) { |
| + OptionsPage.navigateToPage('intents'); |
| + }; |
| + } |
| + |
| + // Chrome-OS specific part |
| + if (cr.isChromeOS && AccountsOptions.loggedInAsGuest()) { |
| + AccountsOptions.disableElementsForGuest( |
| + $('clear-cookies-on-exit-group')); |
| + } |
| + |
| // Cookies filter page --------------------------------------------------- |
| $('show-cookies-button').onclick = function(event) { |
| chrome.send('coreOptionsUserMetricsAction', ['Options_ShowCookies']); |