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

Unified Diff: chrome/browser/ui/webui/extensions/extension_settings_handler.cc

Issue 487913004: Only show the checkbox for all urls when the switch is on (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add Test Created 6 years, 4 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/extensions/extension_ui_unittest.cc ('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/extensions/extension_settings_handler.cc
diff --git a/chrome/browser/ui/webui/extensions/extension_settings_handler.cc b/chrome/browser/ui/webui/extensions/extension_settings_handler.cc
index e99ae2ca046b13e1f546c74a0acda751afbe2a4b..7678bd6bd9f13e1916ad58b013ea8b23572b8a9e 100644
--- a/chrome/browser/ui/webui/extensions/extension_settings_handler.cc
+++ b/chrome/browser/ui/webui/extensions/extension_settings_handler.cc
@@ -291,7 +291,9 @@ base::DictionaryValue* ExtensionSettingsHandler::CreateExtensionDetailValue(
// on those specified in the permissions.
bool wants_all_urls =
util::ScriptsMayRequireActionForExtension(extension) &&
- extension->permissions_data()->HasWithheldImpliedAllHosts();
+ (extension->permissions_data()->HasWithheldImpliedAllHosts() ||
+ util::AllowedScriptingOnAllUrls(
+ extension->id(), extension_service_->GetBrowserContext()));
extension_data->SetBoolean("wantsAllUrls", wants_all_urls);
extension_data->SetBoolean(
"allowAllUrls",
« no previous file with comments | « chrome/browser/extensions/extension_ui_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698