Update extension install prompt to reflect withheld permissions

chrome/browser/extensions/permissions_updater.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/permissions_updater.h"
 
 #include "base/json/json_writer.h"
 #include "base/memory/ref_counted.h"
 #include "base/values.h"
 #include "chrome/browser/chrome_notification_types.h"
@@ skipping 92 matching lines @@
     if (withhold_permissions && iter->ImpliesAllHosts())
       withheld->AddPattern(*iter);
     else
       granted->AddPattern(*iter);
   }
 }
 
 }  // namespace
 
 PermissionsUpdater::PermissionsUpdater(content::BrowserContext* browser_context)
-    : browser_context_(browser_context) {
+    : browser_context_(browser_context), init_flag_(INIT_FLAG_NONE) {
+}
+
+PermissionsUpdater::PermissionsUpdater(content::BrowserContext* browser_context,
+                                       InitFlag init_flag)
+    : browser_context_(browser_context), init_flag_(init_flag) {
 }
 
 PermissionsUpdater::~PermissionsUpdater() {}
 
 void PermissionsUpdater::AddPermissions(
     const Extension* extension, const PermissionSet* permissions) {
   scoped_refptr<const PermissionSet> existing(
       extension->permissions_data()->active_permissions());
   scoped_refptr<PermissionSet> total(
       PermissionSet::CreateUnion(existing.get(), permissions));
@@ skipping 33 matching lines @@
   if (!Manifest::IsUnpackedLocation(extension->location()) &&
       extension->location() != Manifest::INTERNAL)
     return;
 
   ExtensionPrefs::Get(browser_context_)->AddGrantedPermissions(
       extension->id(),
       extension->permissions_data()->active_permissions().get());
 }
 
 void PermissionsUpdater::InitializePermissions(const Extension* extension) {
-  scoped_refptr<const PermissionSet> active_permissions =
-      ExtensionPrefs::Get(browser_context_)
-          ->GetActivePermissions(extension->id());
-  scoped_refptr<const PermissionSet> bounded_active =
-      GetBoundedActivePermissions(extension, active_permissions);
+  scoped_refptr<const PermissionSet> active_permissions(NULL);
+  scoped_refptr<const PermissionSet> bounded_active(NULL);
+  // If |extension| is a transient dummy extension, we do not want to look for
+  // it in preferences.
+  if (init_flag_ & INIT_FLAG_TRANSIENT) {
+    bounded_active = active_permissions =
+        extension->permissions_data()->active_permissions();
+  } else {
+    active_permissions = ExtensionPrefs::Get(browser_context_)
+                             ->GetActivePermissions(extension->id());
+    bounded_active = GetBoundedActivePermissions(extension, active_permissions);
+  }
 
-  // Withhold permissions only if the switch applies to this extension and the
-  // extension doesn't have the preference to allow scripting on all urls.
+  // Withhold permissions if the switch applies to this extension.
+  // Non-transient extensions also must not have the preference to allow
+  // scripting on all urls.
   bool should_withhold_permissions =
-      util::ScriptsMayRequireActionForExtension(extension) &&
-      !util::AllowedScriptingOnAllUrls(extension->id(), browser_context_);
+      util::ScriptsMayRequireActionForExtension(extension);
+  if ((init_flag_ & INIT_FLAG_TRANSIENT) == 0) {
+    should_withhold_permissions &=
+        !util::AllowedScriptingOnAllUrls(extension->id(), browser_context_);
+  }
 
   URLPatternSet granted_explicit_hosts;
   URLPatternSet withheld_explicit_hosts;
   SegregateUrlPermissions(bounded_active->explicit_hosts(),
                           should_withhold_permissions,
                           &granted_explicit_hosts,
                           &withheld_explicit_hosts);
 
   URLPatternSet granted_scriptable_hosts;
   URLPatternSet withheld_scriptable_hosts;
@@ skipping 91 matching lines @@
   // TODO(rdevlin.cronin) We should notify the observers/renderer.
 }
 
 void PermissionsUpdater::SetPermissions(
     const Extension* extension,
     const scoped_refptr<const PermissionSet>& active,
     scoped_refptr<const PermissionSet> withheld) {
   withheld = withheld.get() ? withheld
                  : extension->permissions_data()->withheld_permissions();
   extension->permissions_data()->SetPermissions(active, withheld);
-  ExtensionPrefs::Get(browser_context_)->SetActivePermissions(
-      extension->id(), active.get());
+  if ((init_flag_ & INIT_FLAG_TRANSIENT) == 0) {
+    ExtensionPrefs::Get(browser_context_)
+        ->SetActivePermissions(extension->id(), active.get());
+  }
 }
 
 void PermissionsUpdater::DispatchEvent(
     const std::string& extension_id,
     const char* event_name,
     const PermissionSet* changed_permissions) {

[Devlin, 2014/09/11 21:18:53]

Let's throw in a DCHECK here that we don't have INIT_FLAG_TRANSIENT on.

[gpdavis, 2014/09/12 00:11:54]

Sure thing.  We don't need this anywhere else, do we?

[Devlin, 2014/09/12 00:26:45]

Whoops!  Meant to put this comment in NotifyPermissionsUpdated().

I'm not too worried about it, because Add/Remove permissions both call
NotifyPermissionsUpdated().

[gpdavis, 2014/09/12 00:30:57]

Ah, that makes more sense.  The reason I was asking was because of Add/Remove
permissions, and NotifyPermissionsUpdated was the place I was thinking of for
that very reason.

   EventRouter* event_router = EventRouter::Get(browser_context_);
   if (!event_router)
     return;
 
   scoped_ptr<base::ListValue> value(new base::ListValue());
   scoped_ptr<api::permissions::Permissions> permissions =
       PackPermissionSet(changed_permissions);
   value->Append(permissions->ToValue().release());
   scoped_ptr<Event> event(new Event(event_name, value.Pass()));
   event->restrict_to_browser_context = browser_context_;
@@ skipping 43 matching lines @@
             Profile::FromBrowserContext(host->GetBrowserContext()))) {
       host->Send(new ExtensionMsg_UpdatePermissions(params));
     }
   }
 
   // Trigger the onAdded and onRemoved events in the extension.
   DispatchEvent(extension->id(), event_name, changed);
 }
 
 }  // namespace extensions