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

Side by Side Diff: chrome/browser/ui/webui/options/website_settings_handler.cc

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 unified diff | Download patch
« no previous file with comments | « chrome/browser/ui/webui/options/content_settings_handler.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #include "chrome/browser/ui/webui/options/website_settings_handler.h" 5 #include "chrome/browser/ui/webui/options/website_settings_handler.h"
6 6
7 #include "chrome/browser/content_settings/content_settings_utils.h" 7 #include "chrome/browser/content_settings/content_settings_utils.h"
8 #include "chrome/browser/content_settings/host_content_settings_map.h" 8 #include "chrome/browser/content_settings/host_content_settings_map.h"
9 #include "chrome/browser/extensions/extension_service.h" 9 #include "chrome/browser/extensions/extension_service.h"
10 #include "chrome/browser/profiles/profile.h" 10 #include "chrome/browser/profiles/profile.h"
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 IDS_WEBSITE_SETTINGS_NOTIFICATIONS_DESCRIPTION}, 90 IDS_WEBSITE_SETTINGS_NOTIFICATIONS_DESCRIPTION},
91 {"websitesDownloadsDescription", 91 {"websitesDownloadsDescription",
92 IDS_WEBSITE_SETTINGS_DOWNLOAD_DESCRIPTION}, 92 IDS_WEBSITE_SETTINGS_DOWNLOAD_DESCRIPTION},
93 {"websitesPluginsDescription", IDS_WEBSITE_SETTINGS_PLUGINS_DESCRIPTION}, 93 {"websitesPluginsDescription", IDS_WEBSITE_SETTINGS_PLUGINS_DESCRIPTION},
94 {"websitesPopupsDescription", IDS_WEBSITE_SETTINGS_POPUPS_DESCRIPTION}, 94 {"websitesPopupsDescription", IDS_WEBSITE_SETTINGS_POPUPS_DESCRIPTION},
95 {"websitesJavascriptDescription", 95 {"websitesJavascriptDescription",
96 IDS_WEBSITE_SETTINGS_JAVASCRIPT_DESCRIPTION}, 96 IDS_WEBSITE_SETTINGS_JAVASCRIPT_DESCRIPTION},
97 {"websitesImagesDescription", IDS_WEBSITE_SETTINGS_IMAGES_DESCRIPTION}, 97 {"websitesImagesDescription", IDS_WEBSITE_SETTINGS_IMAGES_DESCRIPTION},
98 {"websitesButtonClear", IDS_WEBSITE_SETTINGS_STORAGE_CLEAR_BUTTON}, 98 {"websitesButtonClear", IDS_WEBSITE_SETTINGS_STORAGE_CLEAR_BUTTON},
99 {"websitesButtonStop", IDS_WEBSITE_SETTINGS_BATTERY_STOP_BUTTON}, 99 {"websitesButtonStop", IDS_WEBSITE_SETTINGS_BATTERY_STOP_BUTTON},
100 {"websitesAllowedListTitle", IDS_WEBSITE_SETTINGS_ALLOWED_LIST_TITLE},
100 {"websitesBlockedListTitle", IDS_WEBSITE_SETTINGS_BLOCKED_LIST_TITLE}, 101 {"websitesBlockedListTitle", IDS_WEBSITE_SETTINGS_BLOCKED_LIST_TITLE},
101 }; 102 };
102 103
103 RegisterStrings(localized_strings, resources, arraysize(resources)); 104 RegisterStrings(localized_strings, resources, arraysize(resources));
104 RegisterTitle( 105 RegisterTitle(
105 localized_strings, "websiteSettingsPage", IDS_WEBSITE_SETTINGS_TITLE); 106 localized_strings, "websiteSettingsPage", IDS_WEBSITE_SETTINGS_TITLE);
106 } 107 }
107 108
108 void WebsiteSettingsHandler::InitializeHandler() { 109 void WebsiteSettingsHandler::InitializeHandler() {
109 Profile* profile = Profile::FromWebUI(web_ui()); 110 Profile* profile = Profile::FromWebUI(web_ui());
(...skipping 629 matching lines...) Expand 10 before | Expand all | Expand 10 after
739 // If extension is NULL, it was removed and we cannot look up its name. 740 // If extension is NULL, it was removed and we cannot look up its name.
740 if (!extension) 741 if (!extension)
741 return site_url.spec(); 742 return site_url.spec();
742 743
743 return extension->name(); 744 return extension->name();
744 } 745 }
745 return site_url.spec(); 746 return site_url.spec();
746 } 747 }
747 748
748 } // namespace options 749 } // namespace options
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/options/content_settings_handler.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698