Prevent unnecessary prompts when unpacked extensions use chrome.permissions.request.

chrome/browser/extensions/unpacked_installer.cc

 // Copyright (c) 2011 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/unpacked_installer.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/file_util.h"
 #include "chrome/browser/extensions/extension_install_ui.h"
 #include "chrome/browser/extensions/extension_prefs.h"
 #include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/extensions/permissions_updater.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_file_util.h"
 #include "chrome/common/string_ordinal.h"
 
 using content::BrowserThread;
 
 namespace {
 
 // Manages an ExtensionInstallUI for a particular extension.
 class SimpleExtensionLoadPrompt : public ExtensionInstallUI::Delegate {
  public:
   SimpleExtensionLoadPrompt(Profile* profile,
                             base::WeakPtr<ExtensionService> extension_service,
                             const Extension* extension);
   ~SimpleExtensionLoadPrompt();
 
   void ShowPrompt();
 
   // ExtensionInstallUI::Delegate
-  virtual void InstallUIProceed();
-  virtual void InstallUIAbort(bool user_initiated);
+  virtual void InstallUIProceed() OVERRIDE;
+  virtual void InstallUIAbort(bool user_initiated) OVERRIDE;
 
  private:
   base::WeakPtr<ExtensionService> service_weak_;
   scoped_ptr<ExtensionInstallUI> install_ui_;
   scoped_refptr<const Extension> extension_;
 };
 
 SimpleExtensionLoadPrompt::SimpleExtensionLoadPrompt(
     Profile* profile,
     base::WeakPtr<ExtensionService> extension_service,
     const Extension* extension)
     : service_weak_(extension_service),
       install_ui_(new ExtensionInstallUI(profile)),
       extension_(extension) {
 }
 
 SimpleExtensionLoadPrompt::~SimpleExtensionLoadPrompt() {
 }
 
 void SimpleExtensionLoadPrompt::ShowPrompt() {
   install_ui_->ConfirmInstall(this, extension_);
 }
 
 void SimpleExtensionLoadPrompt::InstallUIProceed() {
-  if (service_weak_.get())
+  if (service_weak_.get()) {
+    extensions::PermissionsUpdater perms_updater(service_weak_->profile());
+    perms_updater.GrantActivePermissions(extension_);
     service_weak_->OnExtensionInstalled(
         extension_, false, StringOrdinal());  // Not from web store.
+  }
   delete this;
 }
 
 void SimpleExtensionLoadPrompt::InstallUIAbort(bool user_initiated) {
   delete this;
 }
 
 }  // namespace
 
 namespace extensions {
@@ skipping 122 matching lines @@
 void UnpackedInstaller::OnLoaded(
     const scoped_refptr<const Extension>& extension) {
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   if (!service_weak_.get())
     return;
   const ExtensionSet* disabled_extensions =
       service_weak_->disabled_extensions();
   if (service_weak_->show_extensions_prompts() &&
       prompt_for_plugins_ &&
       !extension->plugins().empty() &&
-      disabled_extensions->Contains(extension->id())) {
+      !disabled_extensions->Contains(extension->id())) {
     SimpleExtensionLoadPrompt* prompt = new SimpleExtensionLoadPrompt(
         service_weak_->profile(),
         service_weak_,
         extension);
     prompt->ShowPrompt();
     return;  // continues in SimpleExtensionLoadPrompt::InstallUI*
   }
+
+  PermissionsUpdater perms_updater(service_weak_->profile());
+  perms_updater.GrantActivePermissions(extension);
   service_weak_->OnExtensionInstalled(extension,
                                       false,  // Not from web store.
                                       StringOrdinal());
 }
 
 }  // namespace extensions