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

Unified Diff: chrome/common/extensions/permissions/permission_set.cc

Issue 10837060: Don't show host permission warnings for platform apps. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add EXPECT_TRUE Created 8 years, 5 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/common/extensions/permissions/permission_set.cc
diff --git a/chrome/common/extensions/permissions/permission_set.cc b/chrome/common/extensions/permissions/permission_set.cc
index 5b51616c1e88b03e6795467af0a3966ae488d046..ea964db5bacf713b172e14727cfc984ad03163c9 100644
--- a/chrome/common/extensions/permissions/permission_set.cc
+++ b/chrome/common/extensions/permissions/permission_set.cc
@@ -264,8 +264,8 @@ std::set<std::string>
return GetDistinctHosts(effective_hosts_, true, true);
}
-PermissionMessages
- PermissionSet::GetPermissionMessages() const {
+PermissionMessages PermissionSet::GetPermissionMessages(
+ const Extension* extension) const {
PermissionMessages messages;
if (HasEffectiveFullAccess()) {
@@ -275,14 +275,16 @@ PermissionMessages
return messages;
}
- if (HasEffectiveAccessToAllHosts()) {
- messages.push_back(PermissionMessage(
- PermissionMessage::kHostsAll,
- l10n_util::GetStringUTF16(IDS_EXTENSION_PROMPT_WARNING_ALL_HOSTS)));
- } else {
- std::set<std::string> hosts = GetDistinctHostsForDisplay();
- if (!hosts.empty())
- messages.push_back(PermissionMessage::CreateFromHostList(hosts));
+ if (!extension->is_platform_app()) {
Aaron Boodman 2012/08/01 23:13:05 Consider passing in only the type enum since that
Mihai Parparita -not on Chrome 2012/08/02 00:33:44 Done. Since this means #include-ing extension.h in
+ if (HasEffectiveAccessToAllHosts()) {
+ messages.push_back(PermissionMessage(
+ PermissionMessage::kHostsAll,
+ l10n_util::GetStringUTF16(IDS_EXTENSION_PROMPT_WARNING_ALL_HOSTS)));
+ } else {
+ std::set<std::string> hosts = GetDistinctHostsForDisplay();
+ if (!hosts.empty())
+ messages.push_back(PermissionMessage::CreateFromHostList(hosts));
+ }
}
std::set<PermissionMessage> simple_msgs =
@@ -292,9 +294,10 @@ PermissionMessages
return messages;
}
-std::vector<string16> PermissionSet::GetWarningMessages() const {
+std::vector<string16> PermissionSet::GetWarningMessages(
+ const Extension* extension) const {
std::vector<string16> messages;
- PermissionMessages permissions = GetPermissionMessages();
+ PermissionMessages permissions = GetPermissionMessages(extension);
bool audio_capture = false;
bool video_capture = false;
« no previous file with comments | « chrome/common/extensions/permissions/permission_set.h ('k') | chrome/common/extensions/permissions/permission_set_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698