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

Side by Side Diff: chrome/browser/resources/options2/content_settings.js

Issue 10636019: Adding Application Data dialog for isolated apps (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed merge conflicts Created 8 years, 5 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 cr.define('options', function() { 5 cr.define('options', function() {
6 /** @const */ var OptionsPage = options.OptionsPage; 6 /** @const */ var OptionsPage = options.OptionsPage;
7 7
8 ////////////////////////////////////////////////////////////////////////////// 8 //////////////////////////////////////////////////////////////////////////////
9 // ContentSettings class: 9 // ContentSettings class:
10 10
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 }; 65 };
66 66
67 if (cr.isChromeOS) 67 if (cr.isChromeOS)
68 UIAccountTweaks.applyGuestModeVisibility(document); 68 UIAccountTweaks.applyGuestModeVisibility(document);
69 69
70 // Cookies filter page --------------------------------------------------- 70 // Cookies filter page ---------------------------------------------------
71 $('show-cookies-button').onclick = function(event) { 71 $('show-cookies-button').onclick = function(event) {
72 chrome.send('coreOptionsUserMetricsAction', ['Options_ShowCookies']); 72 chrome.send('coreOptionsUserMetricsAction', ['Options_ShowCookies']);
73 OptionsPage.navigateToPage('cookies'); 73 OptionsPage.navigateToPage('cookies');
74 }; 74 };
75 $('show-app-cookies-button').onclick = function(event) {
76 OptionsPage.navigateToPage('app-cookies');
77 };
75 78
76 var intentsSection = $('intents-section'); 79 var intentsSection = $('intents-section');
77 if (!loadTimeData.getBoolean('enable_web_intents') && intentsSection) 80 if (!loadTimeData.getBoolean('enable_web_intents') && intentsSection)
78 intentsSection.parentNode.removeChild(intentsSection); 81 intentsSection.parentNode.removeChild(intentsSection);
79 82
80 $('content-settings-overlay-confirm').onclick = 83 $('content-settings-overlay-confirm').onclick =
81 OptionsPage.closeOverlay.bind(OptionsPage); 84 OptionsPage.closeOverlay.bind(OptionsPage);
82 85
83 $('pepper-flash-cameramic-section').style.display = 'none'; 86 $('pepper-flash-cameramic-section').style.display = 'none';
84 $('pepper-flash-cameramic-exceptions-div').style.display = 'none'; 87 $('pepper-flash-cameramic-exceptions-div').style.display = 'none';
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
167 $('pepper-flash-cameramic-section').style.display = ''; 170 $('pepper-flash-cameramic-section').style.display = '';
168 $('pepper-flash-cameramic-exceptions-div').style.display = ''; 171 $('pepper-flash-cameramic-exceptions-div').style.display = '';
169 } 172 }
170 173
171 // Export 174 // Export
172 return { 175 return {
173 ContentSettings: ContentSettings 176 ContentSettings: ContentSettings
174 }; 177 };
175 178
176 }); 179 });
OLDNEW
« no previous file with comments | « chrome/browser/resources/options2/content_settings.html ('k') | chrome/browser/resources/options2/cookies_list.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698