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

Unified Diff: chrome/browser/extensions/api/permissions/permissions_api.cc

Issue 957753002: Install default apps if sync is disabled. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Check if sync is enabled locally. Created 5 years, 10 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/browser/extensions/api/permissions/permissions_api.cc
diff --git a/chrome/browser/extensions/api/permissions/permissions_api.cc b/chrome/browser/extensions/api/permissions/permissions_api.cc
index 86f4aa9ac1584d02193858d94ab55141bd56dad3..d7346ec85204b6070dbbcefde0d3eb1e4a730501 100644
--- a/chrome/browser/extensions/api/permissions/permissions_api.cc
+++ b/chrome/browser/extensions/api/permissions/permissions_api.cc
@@ -208,6 +208,11 @@ bool PermissionsRequestFunction::RunAsync() {
requested_permissions_ = PermissionSet::CreateDifference(
requested_permissions_.get(), granted.get());
+ // Filter out the active permissions.
+ requested_permissions_ = PermissionSet::CreateDifference(
+ requested_permissions_.get(),
+ extension()->permissions_data()->active_permissions().get());
+
AddRef(); // Balanced in InstallUIProceed() / InstallUIAbort().
// We don't need to show the prompt if there are no new warnings, or if
« no previous file with comments | « no previous file | chrome/browser/extensions/external_pref_loader.h » ('j') | chrome/browser/extensions/external_pref_loader.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698