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

Unified Diff: chrome/browser/ui/webui/options/website_settings_handler.cc

Issue 542203003: Split the Website Settings page's origin list into Allowed and Blocked lists. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. 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
« no previous file with comments | « chrome/browser/resources/options/website_settings.js ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/options/website_settings_handler.cc
diff --git a/chrome/browser/ui/webui/options/website_settings_handler.cc b/chrome/browser/ui/webui/options/website_settings_handler.cc
index 639afc995930c19039a10b110a614b45e9f18fae..71491d7ad6a4bb5943bc85101a88dc244339c26f 100644
--- a/chrome/browser/ui/webui/options/website_settings_handler.cc
+++ b/chrome/browser/ui/webui/options/website_settings_handler.cc
@@ -91,6 +91,7 @@ void WebsiteSettingsHandler::GetLocalizedValues(
{"websitesImagesDescription", IDS_WEBSITE_SETTINGS_IMAGES_DESCRIPTION},
{"websitesButtonClear", IDS_WEBSITE_SETTINGS_STORAGE_CLEAR_BUTTON},
{"websitesButtonStop", IDS_WEBSITE_SETTINGS_BATTERY_STOP_BUTTON},
+ {"websitesBlockedListTitle", IDS_WEBSITE_SETTINGS_BLOCKED_LIST_TITLE},
};
RegisterStrings(localized_strings, resources, arraysize(resources));
@@ -259,7 +260,8 @@ void WebsiteSettingsHandler::UpdateOrigins() {
settings->GetSettingsForOneType(last_setting, std::string(), &all_settings);
- base::DictionaryValue origins;
+ base::DictionaryValue allowed_origins;
+ base::DictionaryValue blocked_origins;
for (ContentSettingsForOneType::const_iterator it = all_settings.begin();
it != all_settings.end();
++it) {
@@ -313,11 +315,15 @@ void WebsiteSettingsHandler::UpdateOrigins() {
origin_entry->SetStringWithoutPathExpansion("readableName",
GetReadableName(origin_url));
- origins.SetWithoutPathExpansion(origin, origin_entry);
+ if (it->setting == CONTENT_SETTING_BLOCK)
+ blocked_origins.SetWithoutPathExpansion(origin, origin_entry);
+ else
+ allowed_origins.SetWithoutPathExpansion(origin, origin_entry);
}
web_ui()->CallJavascriptFunction("WebsiteSettingsManager.populateOrigins",
- origins);
+ allowed_origins,
+ blocked_origins);
}
void WebsiteSettingsHandler::HandleGetOriginInfo(const base::ListValue* args) {
« no previous file with comments | « chrome/browser/resources/options/website_settings.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698