summaryrefslogtreecommitdiffstats
path: root/chrome/common
diff options
context:
space:
mode:
authorerikkay@chromium.org <erikkay@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-01 22:43:43 +0000
committererikkay@chromium.org <erikkay@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-01 22:43:43 +0000
commit9db95ef4fdf0375b8a6905e3cf8dbd2f5310b33f (patch)
treec04e7f8675f2f824038370210b9257e064a8c628 /chrome/common
parent295f13906ac3663765b65e5d29b4dbe556b2fd00 (diff)
downloadchromium_src-9db95ef4fdf0375b8a6905e3cf8dbd2f5310b33f.zip
chromium_src-9db95ef4fdf0375b8a6905e3cf8dbd2f5310b33f.tar.gz
chromium_src-9db95ef4fdf0375b8a6905e3cf8dbd2f5310b33f.tar.bz2
fix history permission prompt
BUG=54006 TEST=install an extension with history permission. it should warn you about access to your browser history. Review URL: http://codereview.chromium.org/3357002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58251 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
-rw-r--r--chrome/common/extensions/extension.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/common/extensions/extension.cc b/chrome/common/extensions/extension.cc
index c40f93e..3528825 100644
--- a/chrome/common/extensions/extension.cc
+++ b/chrome/common/extensions/extension.cc
@@ -944,7 +944,8 @@ bool Extension::IsPrivilegeIncrease(Extension* old_extension,
// static
bool Extension::HasEffectiveBrowsingHistoryPermission() const {
return HasApiPermission(kTabPermission) ||
- HasApiPermission(kBookmarkPermission);
+ HasApiPermission(kBookmarkPermission) ||
+ HasApiPermission(kHistoryPermission);
}
// static