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

Side by Side Diff: chrome/browser/resources/settings/site_settings_page/site_settings_page.js

Issue 1895113002: Site Settings: Remove FullScreen as top-level category. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 * 'settings-site-settings-page' is the settings page containing privacy and 7 * 'settings-site-settings-page' is the settings page containing privacy and
8 * security site settings. 8 * security site settings.
9 */ 9 */
10 Polymer({ 10 Polymer({
(...skipping 25 matching lines...) Expand all
36 36
37 // Look up the default value for each category and show it. 37 // Look up the default value for each category and show it.
38 this.setDefaultValue_(this.ContentSettingsTypes.COOKIES, '#cookies'); 38 this.setDefaultValue_(this.ContentSettingsTypes.COOKIES, '#cookies');
39 this.setDefaultValue_(this.ContentSettingsTypes.GEOLOCATION, 39 this.setDefaultValue_(this.ContentSettingsTypes.GEOLOCATION,
40 '#geolocation'); 40 '#geolocation');
41 this.setDefaultValue_(this.ContentSettingsTypes.CAMERA, '#camera'); 41 this.setDefaultValue_(this.ContentSettingsTypes.CAMERA, '#camera');
42 this.setDefaultValue_(this.ContentSettingsTypes.MIC, '#mic'); 42 this.setDefaultValue_(this.ContentSettingsTypes.MIC, '#mic');
43 this.setDefaultValue_(this.ContentSettingsTypes.JAVASCRIPT, 43 this.setDefaultValue_(this.ContentSettingsTypes.JAVASCRIPT,
44 '#javascript'); 44 '#javascript');
45 this.setDefaultValue_(this.ContentSettingsTypes.POPUPS, '#popups'); 45 this.setDefaultValue_(this.ContentSettingsTypes.POPUPS, '#popups');
46 this.setDefaultValue_(this.ContentSettingsTypes.FULLSCREEN,
47 '#fullscreen');
48 this.setDefaultValue_(this.ContentSettingsTypes.NOTIFICATIONS, 46 this.setDefaultValue_(this.ContentSettingsTypes.NOTIFICATIONS,
49 '#notifications'); 47 '#notifications');
50 this.setDefaultValue_(this.ContentSettingsTypes.IMAGES, '#images'); 48 this.setDefaultValue_(this.ContentSettingsTypes.IMAGES, '#images');
51 49
52 }, 50 },
53 51
54 setDefaultValue_: function(category, id) { 52 setDefaultValue_: function(category, id) {
55 this.browserProxy.getDefaultValueForContentType( 53 this.browserProxy.getDefaultValueForContentType(
56 category).then(function(enabled) { 54 category).then(function(enabled) {
57 var description = this.computeCategoryDesc(category, enabled, false); 55 var description = this.computeCategoryDesc(category, enabled, false);
(...skipping 18 matching lines...) Expand all
76 this.categorySelected = this.computeCategoryTextId(category); 74 this.categorySelected = this.computeCategoryTextId(category);
77 this.currentRoute = { 75 this.currentRoute = {
78 page: this.currentRoute.page, 76 page: this.currentRoute.page,
79 section: 'privacy', 77 section: 'privacy',
80 subpage: ['site-settings', 'site-settings-category-' + 78 subpage: ['site-settings', 'site-settings-category-' +
81 this.categorySelected], 79 this.categorySelected],
82 }; 80 };
83 } 81 }
84 }, 82 },
85 }); 83 });
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698