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

Unified Diff: chrome/browser/resources/options/website_settings.js

Issue 566863005: Expose the Website Settings page in the Content Setting page if it is enabled via flag. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Handler strings are handled elsewhere. Created 6 years, 3 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/resources/options/website_settings.js
diff --git a/chrome/browser/resources/options/website_settings.js b/chrome/browser/resources/options/website_settings.js
index 0f59a247166437fba278c782fdb6d5b8c2d02e41..f94a3054f88aaeccb9d35beb79a84fc4c24aeed8 100644
--- a/chrome/browser/resources/options/website_settings.js
+++ b/chrome/browser/resources/options/website_settings.js
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-cr.define('options', function() {
+cr.define('options.ContentSettings', function() {
/** @const */ var Page = cr.ui.pageManager.Page;
/** @const */ var PageManager = cr.ui.pageManager.PageManager;
/** @const */ var ArrayDataModel = cr.ui.ArrayDataModel;
@@ -60,12 +60,6 @@ cr.define('options', function() {
$('website-settings-overlay-confirm').onclick =
PageManager.closeOverlay.bind(PageManager);
- $('resourceType').onchange = function(event) {
- var target = event.target;
- assert(target.tagName == 'SELECT');
- WebsiteSettingsManager.getInstance().updatePage_(target.value);
- };
-
$('global-setting').onchange = function(event) {
chrome.send('setDefaultContentSetting', [this.value]);
};
@@ -94,8 +88,6 @@ cr.define('options', function() {
else
hash = 'geolocation';
this.updatePage_(hash);
-
- $('resourceType').value = hash;
},
/**
@@ -239,6 +231,9 @@ cr.define('options', function() {
$('website-settings-global-controls').hidden = false;
chrome.send('updateDefaultSetting');
}
+
+ $('website-settings-title').textContent =
+ loadTimeData.getString(permissionString + 'TabLabel');
}
};
« no previous file with comments | « chrome/browser/resources/options/website_settings.html ('k') | chrome/browser/ui/webui/options/content_settings_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698