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) {

[gpdavis, 2014/09/09 20:28:15]

How about something like this?  The init flag is now a member variable that
defaults to none.  Calling InitializePermissions with a flag will set that
member variable so it doesn't have to be passed around.

Perhaps we could add another constructor that takes in a flag, and the methods
that change prefs could check to make sure the init flag isn't transient before
making changes?

[Devlin, 2014/09/10 22:00:44]

Yeah, we should make another constructor PermissionsUpdater(flag), and then not
even need to pass it in to InitializePermissions().

[gpdavis, 2014/09/11 20:09:21]

Awesome.  Done.

 }
 
 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 32 matching lines @@
   // extensions.
   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,
+                                               InitFlag init_flag) {
+  init_flag_ = init_flag;
+  InitializePermissions(extension);
+}
+
 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.
   bool should_withhold_permissions =
       util::ScriptsMayRequireActionForExtension(extension) &&
       !util::AllowedScriptingOnAllUrls(extension->id(), browser_context_);
 
   URLPatternSet granted_explicit_hosts;
   URLPatternSet withheld_explicit_hosts;
   SegregateUrlPermissions(bounded_active->explicit_hosts(),
@@ skipping 97 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_NONE) {

[Devlin, 2014/09/10 22:00:44]

I think more correct would be
if (init_flag_ & INIT_FLAG_TRANSIENT == 0)

(We should check the absence of the transience flag, not the presence of no
flag)

[gpdavis, 2014/09/11 20:09:21]

I'm not really sure why I didn't do it this way to begin with *shrug*.  Done.

+    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) {
   EventRouter* event_router = EventRouter::Get(browser_context_);
   if (!event_router)
     return;
 
@@ skipping 49 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