retry r144574 with read-after-free fix.
Modify experimental identity flow to display scope descriptions and details.
Only desktop Linux should be affected for now.
largely based on patch by jstritar
BUG=130206
TEST=manual
Review URL: https://chromiumcodereview.appspot.com/10706005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@144782 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc
index 751325b..8ca041b 100644
--- a/chrome/browser/extensions/extension_service.cc
+++ b/chrome/browser/extensions/extension_service.cc
@@ -888,12 +888,12 @@
}
void ExtensionService::GrantPermissionsAndEnableExtension(
- const Extension* extension) {
+ const Extension* extension, bool record_oauth2_grant) {
CHECK(extension);
RecordPermissionMessagesHistogram(
extension, "Extensions.Permissions_ReEnable");
extensions::PermissionsUpdater perms_updater(profile());
- perms_updater.GrantActivePermissions(extension);
+ perms_updater.GrantActivePermissions(extension, record_oauth2_grant);
extension_prefs_->SetDidExtensionEscalatePermissions(extension, false);
EnableExtension(extension->id());
}
